diff --git a/ChangeLog b/ChangeLog index 6d2481bd..26fe7fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ are too unlike the main image - fix to vipsthumbnail --crop, thanks Alessandro - add vips_sum() -- add vips_hough() +- add vips_hough base class and vips_hough_line() 6/3/14 started 7.38.6 - grey ramp minimum was wrong diff --git a/libvips/arithmetic/Makefile.am b/libvips/arithmetic/Makefile.am index a78da011..20c6e627 100644 --- a/libvips/arithmetic/Makefile.am +++ b/libvips/arithmetic/Makefile.am @@ -3,6 +3,8 @@ noinst_LTLIBRARIES = libarithmetic.la libarithmetic_la_SOURCES = \ sum.c \ hough.c \ + hough.h \ + hough_line.c \ abs.c \ complex.c \ deviate.c \ diff --git a/libvips/arithmetic/arithmetic.c b/libvips/arithmetic/arithmetic.c index 73cf60e6..3317f52d 100644 --- a/libvips/arithmetic/arithmetic.c +++ b/libvips/arithmetic/arithmetic.c @@ -707,7 +707,7 @@ vips_arithmetic_operation_init( void ) extern GType vips_hist_find_get_type( void ); extern GType vips_hist_find_ndim_get_type( void ); extern GType vips_hist_find_indexed_get_type( void ); - extern GType vips_hough_get_type( void ); + extern GType vips_hough_line_get_type( void ); extern GType vips_project_get_type( void ); extern GType vips_profile_get_type( void ); extern GType vips_measure_get_type( void ); @@ -744,7 +744,7 @@ vips_arithmetic_operation_init( void ) vips_hist_find_get_type(); vips_hist_find_ndim_get_type(); vips_hist_find_indexed_get_type(); - vips_hough_get_type(); + vips_hough_line_get_type(); vips_project_get_type(); vips_profile_get_type(); vips_measure_get_type(); diff --git a/libvips/arithmetic/hough.c b/libvips/arithmetic/hough.c index b68b1d02..712f45c7 100644 --- a/libvips/arithmetic/hough.c +++ b/libvips/arithmetic/hough.c @@ -43,7 +43,7 @@ #include "statistic.h" #include "hough.h" -G_DEFINE_TYPE_ABSTRACT( VipsHough, vips_hough, VIPS_TYPE_STATISTIC ); +G_DEFINE_ABSTRACT_TYPE( VipsHough, vips_hough, VIPS_TYPE_STATISTIC ); static int vips_hough_build( VipsObject *object ) @@ -100,7 +100,7 @@ vips_hough_start( VipsStatistic *statistic ) */ g_assert( !hough->threads ); - if( !(accumulator = class->new_accumulator( hought )) ) + if( !(accumulator = class->new_accumulator( hough )) ) return( NULL ); if( vips_image_write_prepare( accumulator ) ) { diff --git a/libvips/arithmetic/hough_line.c b/libvips/arithmetic/hough_line.c new file mode 100644 index 00000000..cc47fbea --- /dev/null +++ b/libvips/arithmetic/hough_line.c @@ -0,0 +1,141 @@ +/* hough transform + * + * 7/3/14 + * - from hist_find.c + */ + +/* + + This file is part of VIPS. + + VIPS is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA + + */ + +/* + + These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk + + */ + +#ifdef HAVE_CONFIG_H +#include +#endif /*HAVE_CONFIG_H*/ +#include + +#include + +#include + +#include "statistic.h" +#include "hough.h" + +typedef VipsHough VipsHoughLine; +typedef VipsHoughClass VipsHoughLineClass; + +G_DEFINE_TYPE( VipsHoughLine, vips_hough_line, VIPS_TYPE_HOUGH ); + +/* Build a new accumulator. + */ +static VipsImage * +vips_hough_line_new_accumulator( VipsHough *hough ) +{ + VipsStatistic *statistic = (VipsStatistic *) hough; + + VipsImage *accumulator; + + accumulator = vips_image_new_buffer(); + + vips_image_pipelinev( accumulator, + VIPS_DEMAND_STYLE_ANY, statistic->in, NULL ); + + vips_image_init_fields( accumulator, + hough->width, hough->height, 1, + VIPS_FORMAT_UINT, VIPS_CODING_NONE, + VIPS_INTERPRETATION_MATRIX, + 1.0, 1.0 ); + + return( (void *) accumulator ); +} + +/* Cast votes for all lines passing through x, y. + */ +static void +vips_hough_line_vote( VipsHough *hough, VipsImage *accumulator, int x, int y ) +{ + VipsStatistic *statistic = (VipsStatistic *) hough; + double xd = (double) x / statistic->ready->Xsize; + double yd = (double) y / statistic->ready->Ysize; + + int thetai; + + for( thetai = 0; thetai < hough->width; thetai++ ) { + double theta = 2 * M_PI * thetai / hough->width; + double r = xd * cos( theta ) + yd * sin( theta ); + int ri = hough->height * r; + + if( ri >= 0 && + ri < hough->height ) + *VIPS_IMAGE_ADDR( accumulator, thetai, ri ) += 1; + } +} + +static void +vips_hough_line_class_init( VipsHoughClass *class ) +{ + VipsObjectClass *object_class = (VipsObjectClass *) class; + VipsHoughClass *hclass = (VipsHoughClass *) class; + + object_class->nickname = "hough_line"; + object_class->description = _( "find hough line transform" ); + + hclass->new_accumulator = vips_hough_line_new_accumulator; + hclass->vote = vips_hough_line_vote; + +} + +static void +vips_hough_line_init( VipsHoughLine *hough_line ) +{ +} + +/** + * vips_hough_line: + * @in: input image + * @out: output image + * @...: %NULL-terminated list of optional named arguments + * + * Optional arguments: + * + * @width: horizontal size of parameter space + * @height: vertical size of parameter space + * + * See also: + * + * Returns: 0 on success, -1 on error + */ +int +vips_hough_line( VipsImage *in, VipsImage **out, ... ) +{ + va_list ap; + int result; + + va_start( ap, out ); + result = vips_call_split( "hough_line", ap, in, out ); + va_end( ap ); + + return( result ); +} diff --git a/libvips/arithmetic/houghline.c b/libvips/arithmetic/houghline.c deleted file mode 100644 index f9a21686..00000000 --- a/libvips/arithmetic/houghline.c +++ /dev/null @@ -1,235 +0,0 @@ -/* hough transform - * - * 7/3/14 - * - from hist_find.c - */ - -/* - - This file is part of VIPS. - - VIPS is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA - - */ - -/* - - These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk - - */ - -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ -#include - -#include - -#include - -#include "statistic.h" -#include "hough.h" - -typedef VipsHoughLine VipsHough; -typedef VipsHoughLineClass VipsHoughClass; - -G_DEFINE_TYPE( VipsHough, vips_hough, VIPS_TYPE_HOUGH ); - -/* Build a new accumulator. - */ -static VipsImage * -vips_houghline_new_accumulator( VipsHough *hough ) -{ - VipsStatistic *statistic = (VipsSt - VipsImage *accumulator; - - accumulator = vips_image_new_buffer(); - - vips_image_pipelinev( accumulator, - VIPS_DEMAND_STYLE_ANY, statistic->in, NULL ); - - vips_image_init_fields( accumulator, - hough->width, hough->height, 1, - VIPS_FORMAT_UINT, VIPS_CODING_NONE, - VIPS_INTERPRETATION_MATRIX, - 1.0, 1.0 ); - - if( vips_image_write_prepare( accumulator ) ) { - g_object_unref( accumulator ); - return( NULL ); - } - - /* vips does not guarantee image mem is zeroed. - */ - memset( VIPS_IMAGE_ADDR( accumulator, 0, 0 ), 0, - VIPS_IMAGE_SIZEOF_IMAGE( accumulator ) ); - - return( (void *) accumulator ); -} - -/* Add our finished accumulator to the main area. - */ -static int -vips_hough_stop( VipsStatistic *statistic, void *seq ) -{ - VipsImage *accumulator = (VipsImage *) seq; - VipsHough *hough = (VipsHough *) statistic; - - /* If this is the first stop, build the main accumulator array. We - * assume no more threads will start, see the assert above. - */ - if( !hough->threads ) - /* This will unref the accumulators automatically on dispose. - */ - hough->threads = (VipsImage **) - vips_object_local_array( VIPS_OBJECT( hough ), - hough->n_threads ); - - g_assert( !hough->threads[hough->ith] ); - - hough->threads[hough->ith] = accumulator; - hough->ith += 1; - - return( 0 ); -} - -/* Cast votes for all lines passing through x, y. - */ -static void -hough_vote( VipsHough *hough, VipsImage *accumulator, int x, int y ) -{ - VipsStatistic *statistic = (VipsStatistic *) hough; - double xd = (double) x / statistic->ready->Xsize; - double yd = (double) y / statistic->ready->Ysize; - - int thetai; - - for( thetai = 0; thetai < hough->width; thetai++ ) { - double theta = 2 * M_PI * thetai / hough->width; - double r = xd * cos( theta ) + yd * sin( theta ); - int ri = hough->height * r; - - if( ri >= 0 && - ri < hough->height ) - *VIPS_IMAGE_ADDR( accumulator, thetai, ri ) += 1; - } -} - -/* See our superclass in statistic.c, but this is called for each section of - * each scanline. @x, @y is the position of the left end, @in is the pixel - * data, @n is the number of pixels in this scanline. VipsPel is uint8. - */ -static int -vips_hough_scan( VipsStatistic *statistic, - void *seq, int x, int y, void *in, int n ) -{ - VipsHough *hough = (VipsHough *) statistic; - VipsImage *accumulator = (VipsImage *) seq; - VipsPel *p = (VipsPel *) in; - - int i; - - for( i = 0; i < n; i++ ) - if( p[i] ) - hough_vote( hough, accumulator, x + i, y ); - - return( 0 ); -} - -#define UC VIPS_FORMAT_UCHAR - -/* Input image is cast to this format. - */ -static const VipsBandFormat vips_hough_format_table[10] = { -/* UC C US S UI I F X D DX */ - UC, UC, UC, UC, UC, UC, UC, UC, UC, UC -}; - -static void -vips_hough_class_init( VipsHoughClass *class ) -{ - GObjectClass *gobject_class = (GObjectClass *) class; - VipsObjectClass *object_class = (VipsObjectClass *) class; - VipsStatisticClass *sclass = VIPS_STATISTIC_CLASS( class ); - - gobject_class->set_property = vips_object_set_property; - gobject_class->get_property = vips_object_get_property; - - object_class->nickname = "hough"; - object_class->description = _( "find hough transform" ); - object_class->build = vips_hough_build; - - sclass->start = vips_hough_start; - sclass->scan = vips_hough_scan; - sclass->stop = vips_hough_stop; - sclass->format_table = vips_hough_format_table; - - VIPS_ARG_IMAGE( class, "out", 100, - _( "Output" ), - _( "Output image" ), - VIPS_ARGUMENT_REQUIRED_OUTPUT, - G_STRUCT_OFFSET( VipsHough, out ) ); - - VIPS_ARG_INT( class, "width", 110, - _( "Width" ), - _( "horizontal size of parameter space" ), - VIPS_ARGUMENT_OPTIONAL_INPUT, - G_STRUCT_OFFSET( VipsHough, width ), - 1, 100000, 256 ); - - VIPS_ARG_INT( class, "height", 110, - _( "Height" ), - _( "Vertical size of parameter space" ), - VIPS_ARGUMENT_OPTIONAL_INPUT, - G_STRUCT_OFFSET( VipsHough, height ), - 1, 100000, 256 ); - -} - -static void -vips_hough_init( VipsHough *hough ) -{ - hough->width = 256; - hough->height = 256; -} - -/** - * vips_hough: - * @in: input image - * @out: output image - * @...: %NULL-terminated list of optional named arguments - * - * Optional arguments: - * - * @width: horizontal size of parameter space - * @height: vertical size of parameter space - * - * See also: - * - * Returns: 0 on success, -1 on error - */ -int -vips_hough( VipsImage *in, VipsImage **out, ... ) -{ - va_list ap; - int result; - - va_start( ap, out ); - result = vips_call_split( "hough", ap, in, out ); - va_end( ap ); - - return( result ); -} diff --git a/libvips/include/vips/arithmetic.h b/libvips/include/vips/arithmetic.h index 48ebf23c..685b7080 100644 --- a/libvips/include/vips/arithmetic.h +++ b/libvips/include/vips/arithmetic.h @@ -388,7 +388,7 @@ int vips_hist_find_ndim( VipsImage *in, VipsImage **out, ... ) int vips_hist_find_indexed( VipsImage *in, VipsImage *index, VipsImage **out, ... ) __attribute__((sentinel)); -int vips_hough( VipsImage *in, VipsImage **out, ... ) +int vips_hough_line( VipsImage *in, VipsImage **out, ... ) __attribute__((sentinel)); int vips_project( VipsImage *in, VipsImage **columns, VipsImage **rows, ... ) __attribute__((sentinel));