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

mapim nan-avoidance was not quite right

Browse Source 
fix the nan-avoidance code in mapim
This commit is contained in:
John Cupitt 2021-02-22 09:37:35 +00:00
parent 8dc2db9789
commit eacef0799a
1 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
libvips/resample/mapim.c
View File

@ -77,54 +77,6 @@ typedef VipsResampleClass VipsMapimClass;
G_DEFINE_TYPE( VipsMapim, vips_mapim, VIPS_TYPE_RESAMPLE );
/* Minmax of a line of float pixels. We have to ignore NaN.
*/
#define FMINMAX( TYPE ) { \
TYPE * restrict p1 = (TYPE *) p; \
TYPE t_max_x = max_x; \
TYPE t_min_x = min_x; \
TYPE t_max_y = max_y; \
TYPE t_min_y = min_y; \
\
for( x = 0; x < r->width; x++ ) { \
TYPE px = p1[0]; \
TYPE py = p1[1]; \
\
if( VIPS_ISNAN( px ) || \
VIPS_ISNAN( py ) ) \
continue; \
\
if( first ) { \
t_min_x = px; \
t_max_x = px; \
t_min_y = py; \
t_max_y = py; \
\
first = FALSE; \
} \
else { \
if( px > t_max_x ) \
t_max_x = px; \
else if( px < t_min_x ) \
t_min_x = px; \
\
if( py > t_max_y ) \
t_max_y = py; \
else if( py < t_min_y ) \
t_min_y = py; \
} \
\
p1 += 2; \
} \
\
if( !first ) { \
min_x = VIPS_CLIP( 0, floor( t_min_x ), VIPS_MAX_COORD ); \
max_x = VIPS_CLIP( 0, floor( t_max_x ), VIPS_MAX_COORD ); \
min_y = VIPS_CLIP( 0, floor( t_min_y ), VIPS_MAX_COORD ); \
max_y = VIPS_CLIP( 0, floor( t_max_y ), VIPS_MAX_COORD ); \
} \
}
/* Minmax of a line of pixels. Pass in a thing to convert back to int
* coordinates.
*/
@ -168,6 +120,53 @@ G_DEFINE_TYPE( VipsMapim, vips_mapim, VIPS_TYPE_RESAMPLE );
max_y = CLIP( t_max_y ); \
}
/* Minmax of a line of float pixels. We have to ignore NaN.
*/
#define FMINMAX( TYPE ) { \
TYPE * restrict p1 = (TYPE *) p; \
TYPE t_max_x = max_x; \
TYPE t_min_x = min_x; \
TYPE t_max_y = max_y; \
TYPE t_min_y = min_y; \
\
for( x = 0; x < r->width; x++ ) { \
TYPE px = p1[0]; \
TYPE py = p1[1]; \
\
if( !VIPS_ISNAN( px ) && \
!VIPS_ISNAN( py ) ) { \
if( first ) { \
t_min_x = px; \
t_max_x = px; \
t_min_y = py; \
t_max_y = py; \
\
first = FALSE; \
} \
else { \
if( px > t_max_x ) \
t_max_x = px; \
else if( px < t_min_x ) \
t_min_x = px; \
\
if( py > t_max_y ) \
t_max_y = py; \
else if( py < t_min_y ) \
t_min_y = py; \
} \
}\
\
p1 += 2; \
} \
\
if( !first ) { \
min_x = VIPS_CLIP( 0, floor( t_min_x ), VIPS_MAX_COORD ); \
max_x = VIPS_CLIP( 0, floor( t_max_x ), VIPS_MAX_COORD ); \
min_y = VIPS_CLIP( 0, floor( t_min_y ), VIPS_MAX_COORD ); \
max_y = VIPS_CLIP( 0, floor( t_max_y ), VIPS_MAX_COORD ); \
} \
}
/* All the clippers. These vary with TYPE.
*/