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

small cleanups

Browse Source
This commit is contained in:
John Cupitt 2013-08-12 13:30:30 +01:00
parent ae6d917811
commit eea3cbf180
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,3 +1,4 @@
- use g_log() instead of vips_info()
- what's the difference between buildlut and invertlut? can we make invertlut - what's the difference between buildlut and invertlut? can we make invertlut
by just swapping the channels before calling buildlut? by just swapping the channels before calling buildlut?

20
libvips/arithmetic/hist_find.c
View File

@ -77,7 +77,9 @@ typedef struct {
typedef struct _VipsHistFind { typedef struct _VipsHistFind {
VipsStatistic parent_instance; VipsStatistic parent_instance;
int band; /* -1 for all bands, or the band we scan.
*/
int which;
/* Main image histogram. Subhists accumulate to this. /* Main image histogram. Subhists accumulate to this.
*/ */
@ -137,7 +139,7 @@ vips_hist_find_build( VipsObject *object )
if( statistic->in && if( statistic->in &&
vips_check_bandno( class->nickname, vips_check_bandno( class->nickname,
statistic->in, hist_find->band ) ) statistic->in, hist_find->which ) )
return( -1 ); return( -1 );
/* main hist made on first thread start. /* main hist made on first thread start.
@ -181,9 +183,9 @@ vips_hist_find_start( VipsStatistic *statistic )
*/ */
if( !hist_find->hist ) if( !hist_find->hist )
hist_find->hist = histogram_new( hist_find, hist_find->hist = histogram_new( hist_find,
hist_find->band == -1 ? hist_find->which == -1 ?
statistic->ready->Bands : 1, statistic->ready->Bands : 1,
hist_find->band, hist_find->which,
statistic->ready->BandFmt == VIPS_FORMAT_UCHAR ? statistic->ready->BandFmt == VIPS_FORMAT_UCHAR ?
256 : 65536 ); 256 : 65536 );
@ -235,9 +237,7 @@ vips_hist_find_uchar_scan( VipsStatistic *statistic,
int i, j, z; int i, j, z;
/* FIXME /* Tried swapping these loops, no meaningful speedup.
*
* Try swapping these loops, we could remove an indexing operation.
*/ */
for( i = 0, j = 0; j < n; j++ ) for( i = 0, j = 0; j < n; j++ )
@ -347,7 +347,7 @@ vips_hist_find_scan( VipsStatistic *statistic, void *seq,
VipsHistFind *hist_find = (VipsHistFind *) statistic; VipsHistFind *hist_find = (VipsHistFind *) statistic;
VipsStatisticScanFn scan; VipsStatisticScanFn scan;
if( hist_find->band < 0 ) { if( hist_find->which < 0 ) {
if( statistic->in->BandFmt == VIPS_FORMAT_UCHAR ) if( statistic->in->BandFmt == VIPS_FORMAT_UCHAR )
scan = vips_hist_find_uchar_scan; scan = vips_hist_find_uchar_scan;
else else
@ -405,7 +405,7 @@ vips_hist_find_class_init( VipsHistFindClass *class )
_( "Band" ), _( "Band" ),
_( "Find histogram of band" ), _( "Find histogram of band" ),
VIPS_ARGUMENT_OPTIONAL_INPUT, VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsHistFind, band ), G_STRUCT_OFFSET( VipsHistFind, which ),
-1, 100000, -1 ); -1, 100000, -1 );
} }
@ -413,7 +413,7 @@ vips_hist_find_class_init( VipsHistFindClass *class )
static void static void
vips_hist_find_init( VipsHistFind *hist_find ) vips_hist_find_init( VipsHistFind *hist_find )
{ {
hist_find->band = -1; hist_find->which = -1;
} }
/** /**