sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hough_circle 20% speedup

Browse Source
This commit is contained in:
John Cupitt 2018-02-02 07:39:10 +00:00
parent 78db92e60e
commit 59afb52f7c
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libvips/arithmetic/hough_circle.c
View File

@ -2,6 +2,8 @@
* *
* 7/3/14 * 7/3/14
* - from hough_line.c * - from hough_line.c
* 2/1/18
* - 20% speedup
*/ */
/* /*
@ -141,37 +143,24 @@ vips_hough_circle_init_accumulator( VipsHough *hough, VipsImage *accumulator )
return( 0 ); return( 0 );
} }
static inline void
vips_hough_circle_vote_point( VipsImage *image, int x, int y, void *client )
{
guint *q = (guint *) VIPS_IMAGE_ADDR( image, x, y );
int r = *((int *) client);
g_assert( image->BandFmt == VIPS_FORMAT_UINT );
g_assert( x >= 0 );
g_assert( y >= 0 );
g_assert( x < image->Xsize );
g_assert( y < image->Ysize );
g_assert( r >= 0 );
g_assert( r < image->Bands );
q[r] += 1;
}
/* Vote endpoints, with clip. /* Vote endpoints, with clip.
*/ */
static void static void
vips_hough_circle_vote_endpoints_clip( VipsImage *image, vips_hough_circle_vote_endpoints_clip( VipsImage *image,
int y, int x1, int x2, int quadrant, void *client ) int y, int x1, int x2, int quadrant, void *client )
{ {
int r = *((int *) client);
guint *line = (guint *) VIPS_IMAGE_ADDR( image, 0, y ) + r;
int b = image->Bands;
if( y >= 0 && if( y >= 0 &&
y < image->Ysize ) { y < image->Ysize ) {
if( x1 >=0 && if( x1 >=0 &&
x1 < image->Xsize ) x1 < image->Xsize )
vips_hough_circle_vote_point( image, x1, y, client ); line[x1 * b] += 1;
if( x2 >=0 && if( x2 >=0 &&
x2 < image->Xsize ) x2 < image->Xsize )
vips_hough_circle_vote_point( image, x2, y, client ); line[x2 * b] += 1;
} }
} }
@ -181,8 +170,12 @@ static void
vips_hough_circle_vote_endpoints_noclip( VipsImage *image, vips_hough_circle_vote_endpoints_noclip( VipsImage *image,
int y, int x1, int x2, int quadrant, void *client ) int y, int x1, int x2, int quadrant, void *client )
{ {
vips_hough_circle_vote_point( image, x1, y, client ); int r = *((int *) client);
vips_hough_circle_vote_point( image, x2, y, client ); guint *line = (guint *) VIPS_IMAGE_ADDR( image, 0, y ) + r;
int b = image->Bands;
line[x1 * b] += 1;
line[x2 * b] += 1;
} }
/* Cast votes for all possible circles passing through x, y. /* Cast votes for all possible circles passing through x, y.
@ -211,7 +204,7 @@ vips_hough_circle_vote( VipsHough *hough, VipsImage *accumulator, int x, int y )
cy - r >= 0 && cy - r >= 0 &&
cy + r < accumulator->Ysize ) cy + r < accumulator->Ysize )
draw_scanline = vips_hough_circle_vote_endpoints_noclip; draw_scanline = vips_hough_circle_vote_endpoints_noclip;
else else
draw_scanline = vips_hough_circle_vote_endpoints_clip; draw_scanline = vips_hough_circle_vote_endpoints_clip;
vips__draw_circle_direct( accumulator, vips__draw_circle_direct( accumulator,