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

oops fix build

This commit is contained in:
John Cupitt 2013-11-11 17:38:34 +00:00
parent b3484e1c8e
commit bc0c4f60d6
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -12,8 +12,6 @@
note on memuse page
- add vips_gamma(), see rad etc.
- do conv and morph quickly as simple wrappers over the vips7 operations
- add vips_gaussian_blur() with approx / int / float precision, maybe

2
libvips/conversion/Makefile.am
View File

@ -4,7 +4,7 @@ libconversion_la_SOURCES = \
conversion.c \
pconversion.h \
tilecache.c \
gammacorrect.c \
gamma.c \
sequential.c \
flatten.c \
cache.c \

4
libvips/conversion/conversion.c
View File

@ -232,7 +232,7 @@ vips_conversion_operation_init( void )
#endif /*HAVE_PANGOFT2*/
extern GType vips_xyz_get_type( void );
extern GType vips_falsecolour_get_type( void );
extern GType vips_gammacorrect_get_type( void );
extern GType vips_gamma_get_type( void );
vips_copy_get_type();
vips_tile_cache_get_type();
@ -270,7 +270,7 @@ vips_conversion_operation_init( void )
#endif /*HAVE_PANGOFT2*/
vips_xyz_get_type();
vips_falsecolour_get_type();
vips_gammacorrect_get_type();
vips_gamma_get_type();
}
/* The common part of most binary conversion

4
libvips/conversion/gammacorrect.c → libvips/conversion/gamma.c
View File

@ -93,10 +93,10 @@ vips_gamma_build( VipsObject *object )
return( -1 );
scale = pow( vips_gamma_maxval[in->BandFmt],
gamma->exponent ) /
1.0 / gamma->exponent ) /
vips_gamma_maxval[in->BandFmt];
if( in->BandFmt == VIPS_FORMAT_UCHAR &&
if( in->BandFmt == VIPS_FORMAT_UCHAR ||
in->BandFmt == VIPS_FORMAT_USHORT ) {
if( vips_identity( &t[0],
"ushort", in->BandFmt == VIPS_FORMAT_USHORT,