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

stop image abuse in labelregions

Browse Source 
we were marking as image as changing by calling vips_image_readwrite(),
but the cache system didn't uncache it
This commit is contained in:
John Cupitt 2014-06-13 09:44:58 +01:00
parent bf56f8f203
commit 6e48c47533
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,3 +1,7 @@
- vips_image_readwrite() or whatever its called should signal invalidate or
mark the image as uncacheable or something
- can we use postbuild elsewhere? look at use of "preclose" / "written", etc.

42
libvips/morphology/labelregions.c
View File

@ -60,11 +60,11 @@ static int
vips_labelregions_build( VipsObject *object )
{
VipsMorphology *morphology = VIPS_MORPHOLOGY( object );
VipsLabelregions *labelregions = (VipsLabelregions *) object;
VipsImage *in = morphology->in;
VipsImage **t = (VipsImage **) vips_object_local_array( object, 7 );
VipsImage **t = (VipsImage **) vips_object_local_array( object, 2 );
VipsImage *mask;
int serial;
int segments;
int *m;
int x, y;
@ -72,43 +72,39 @@ vips_labelregions_build( VipsObject *object )
build( object ) )
return( -1 );
/* Create the zero mask image.
/* Create the zero mask image in memory.
*/
mask = vips_image_new_memory();
g_object_set( object,
"mask", mask,
NULL );
if( vips_black( &t[0], in->Xsize, in->Ysize, NULL ) ||
vips_cast( t[0], &t[1], VIPS_FORMAT_INT, NULL ) )
vips_cast( t[0], &t[1], VIPS_FORMAT_INT, NULL ) ||
vips_image_write( t[1], mask ) )
return( -1 );
/* Search the mask image, flooding as we find zero pixels.
*/
if( vips_image_inplace( t[1] ) )
return( -1 );
serial = 1;
m = (int *) t[1]->data;
for( y = 0; y < t[1]->Ysize; y++ ) {
for( x = 0; x < t[1]->Xsize; x++ ) {
segments = 1;
m = (int *) mask->data;
for( y = 0; y < mask->Ysize; y++ ) {
for( x = 0; x < mask->Xsize; x++ ) {
if( !m[x] ) {
/* Use a direct path for speed.
*/
if( vips__draw_flood_direct( t[1], in,
serial, x, y ) )
if( vips__draw_flood_direct( mask, in,
segments, x, y ) )
return( -1 );
serial += 1;
segments += 1;
}
}
m += t[1]->Xsize;
m += mask->Xsize;
}
g_object_set( object,
"mask", vips_image_new(),
"segments", serial,
"segments", segments,
NULL );
if( vips_image_write( t[1], labelregions->mask ) )
return( -1 );
return( 0 );
}