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

stuff

Browse Source
This commit is contained in:
John Cupitt 2008-12-28 23:21:03 +00:00
parent 6ea9df5b9d
commit 9ac76a9e58
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@
data data
- added vips_format_get_flags() - added vips_format_get_flags()
- oop, forgot to check for cancel during tiled tiff write - oop, forgot to check for cancel during tiled tiff write
- don't use mmap for tiff read: no performance advantage, chews up VM
11/9/08 started 7.16.3 11/9/08 started 7.16.3
- oop typo in manpage for im_project() - oop typo in manpage for im_project()

7
libsrc/convolution/im_shrink.c
View File

@ -32,6 +32,8 @@
* - more typedef * - more typedef
* 3/7/95 JC * 3/7/95 JC
* - IM_CODING_LABQ handling added here * - IM_CODING_LABQ handling added here
* 20/12/08
* - fall back to im_copy() for 1/1 shrink
*/ */
/* /*
@ -296,7 +298,10 @@ shrink( IMAGE *in, IMAGE *out, double xshrink, double yshrink )
int int
im_shrink( IMAGE *in, IMAGE *out, double xshrink, double yshrink ) im_shrink( IMAGE *in, IMAGE *out, double xshrink, double yshrink )
{ {
if( in->Coding == IM_CODING_LABQ ) { if( xshrink == 1 && yshrink == 1 ) {
return( im_copy( in, out ) );
}
else if( in->Coding == IM_CODING_LABQ ) {
IMAGE *t[2]; IMAGE *t[2];
if( im_open_local_array( out, t, 2, "im_shrink:1", "p" ) || if( im_open_local_array( out, t, 2, "im_shrink:1", "p" ) ||

14
libsrc/format/im_tiff2vips.c
View File

@ -103,6 +103,9 @@
* - allow CMYKA (thanks Doron) * - allow CMYKA (thanks Doron)
* 15/8/08 * 15/8/08
* - reorganise for image format system * - reorganise for image format system
* 20/12/08
* - dont read with mmap: no performance advantage with libtiff, chews up
* VM wastefully
*/ */
/* /*
@ -1395,9 +1398,10 @@ get_directory( const char *filename, int page )
TIFF *tif; TIFF *tif;
int i; int i;
/* No need to use "b" and it means something different anyway. /* No mmap --- no performance advantage with libtiff, and it burns up
* our VM if the tiff file is large.
*/ */
if( !(tif = TIFFOpen( filename, "r" )) ) { if( !(tif = TIFFOpen( filename, "rm" )) ) {
im_error( "im_tiff2vips", im_error( "im_tiff2vips",
_( "unable to open \"%s\" for input" ), _( "unable to open \"%s\" for input" ),
filename ); filename );
@ -1520,11 +1524,7 @@ istifftiled( const char *filename )
TIFFSetErrorHandler( (TIFFErrorHandler) im__thandler_error ); TIFFSetErrorHandler( (TIFFErrorHandler) im__thandler_error );
TIFFSetWarningHandler( (TIFFErrorHandler) im__thandler_warning ); TIFFSetWarningHandler( (TIFFErrorHandler) im__thandler_warning );
#ifdef BINARY_OPEN if( !(tif = TIFFOpen( filename, "rm" )) ) {
if( !(tif = TIFFOpen( filename, "rb" )) ) {
#else /*BINARY_OPEN*/
if( !(tif = TIFFOpen( filename, "r" )) ) {
#endif /*BINARY_OPEN*/
/* Not a TIFF file ... return False. /* Not a TIFF file ... return False.
*/ */
im_error_clear(); im_error_clear();