stuff
This commit is contained in:
parent
d2f5893641
commit
7e6deb8548
8
TODO
8
TODO
@ -1,6 +1,12 @@
|
|||||||
- vipsthumbnail should use "rd" mode
|
- vipsthumbnail should use "rd" mode
|
||||||
|
|
||||||
- test "vips" rd open stuff
|
- we leak a region with
|
||||||
|
|
||||||
|
vips --vips-progress im_copy wtc.jpg wtc.v
|
||||||
|
|
||||||
|
how odd, also memuse is no lower ... we appear to open to memory, then copy
|
||||||
|
to temp disc, then copy to output disc
|
||||||
|
|
||||||
|
|
||||||
- lcms2 needs testing
|
- lcms2 needs testing
|
||||||
|
|
||||||
|
@ -127,8 +127,8 @@ Modified:
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
#define DEBUG
|
|
||||||
*/
|
*/
|
||||||
|
#define DEBUG
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
@ -340,12 +340,12 @@ disc_threshold( void )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printf( "disc_threshold: parsed \"im__disc_threshold\" as %zd\n",
|
printf( "disc_threshold: parsed \"%s\" as %zd\n",
|
||||||
im__disc_threshold, threshold );
|
im__disc_threshold, threshold );
|
||||||
#endif /*DEBUG*/
|
#endif /*DEBUG*/
|
||||||
|
}
|
||||||
|
|
||||||
return( threshold );
|
return( threshold );
|
||||||
}
|
}
|
||||||
@ -357,19 +357,27 @@ open_sub( VipsFormatClass *format, const char *filename, gboolean disc )
|
|||||||
|
|
||||||
/* We open to disc if:
|
/* We open to disc if:
|
||||||
* - 'disc' is set
|
* - 'disc' is set
|
||||||
|
* - disc_threshold() has not been set to zero
|
||||||
* - the format does not support lazy read
|
* - the format does not support lazy read
|
||||||
* - the image will be more than a megabyte, uncompressed
|
* - the image will be more than a megabyte, uncompressed
|
||||||
*/
|
*/
|
||||||
im = NULL;
|
im = NULL;
|
||||||
if( disc )
|
if( disc &&
|
||||||
if( !(vips_format_get_flags( format, filename ) &
|
disc_threshold() &&
|
||||||
|
!(vips_format_get_flags( format, filename ) &
|
||||||
VIPS_FORMAT_PARTIAL) ) {
|
VIPS_FORMAT_PARTIAL) ) {
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
||||||
size = guess_size( format, filename );
|
size = guess_size( format, filename );
|
||||||
if( size > disc_threshold() )
|
if( size > disc_threshold() ) {
|
||||||
if( !(im = im__open_temp( "%s.v" )) )
|
if( !(im = im__open_temp( "%s.v" )) )
|
||||||
return( NULL );
|
return( NULL );
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf( "open_sub: opening to disc file \"%s\"\n",
|
||||||
|
im->filename );
|
||||||
|
#endif /*DEBUG*/
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Otherwise, fall back to a "p".
|
/* Otherwise, fall back to a "p".
|
||||||
|
Loading…
Reference in New Issue
Block a user