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

allow dzsave zip output > 4gb

Browse Source 
thanks benjamin
This commit is contained in:
John Cupitt 2015-06-08 09:35:25 +01:00
parent 255c3dc7a8
commit 33788f7336
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@
- try to support DOS CSV and PPM files on linux - try to support DOS CSV and PPM files on linux
- add vips_byteswap(), remove byteswap option from vips_copy() - add vips_byteswap(), remove byteswap option from vips_copy()
- add vips_bandfold()/vips_bandunfold() - add vips_bandfold()/vips_bandunfold()
- dzsave supports zip output > 4gb, thanks benjamin
7/5/15 started 8.0.3 7/5/15 started 8.0.3
- dzsave and tif pyr write could fail for some image dimensions, thanks Jonas - dzsave and tif pyr write could fail for some image dimensions, thanks Jonas

17
libvips/foreign/dzsave.c
View File

@ -51,6 +51,8 @@
* - use vips_region_shrink() * - use vips_region_shrink()
* 22/2/15 * 22/2/15
* - use a better temp dir name for fs dz output * - use a better temp dir name for fs dz output
* 8/8/15
* - allow zip > 4gb if we have a recent libgsf
*/ */
/* /*
@ -333,6 +335,16 @@ vips_gsf_path( VipsGsfDirectory *tree, const char *name, ... )
return( obj ); return( obj );
} }
/* libgsf before 1.14.31 did not support zip64.
*/
static gboolean
vips_gsf_has_zip64( void )
{
return( libgsf_major_version > 1 ||
libgsf_minor_version > 14 ||
libgsf_micro_version > 31 );
}
typedef struct _VipsForeignSaveDz VipsForeignSaveDz; typedef struct _VipsForeignSaveDz VipsForeignSaveDz;
typedef struct _Layer Layer; typedef struct _Layer Layer;
@ -433,8 +445,8 @@ struct _VipsForeignSaveDz {
*/ */
char *file_suffix; char *file_suffix;
/* libgsf can't write zip files larger than 4gb. Track bytes written /* libgsf before 1.14.31 can't write zip files larger than 4gb.
* here and try to guess when we'll go over. * Track bytes written here and try to guess when we'll go over.
*/ */
size_t bytes_written; size_t bytes_written;
}; };
@ -1151,6 +1163,7 @@ strip_work( VipsThreadState *state, void *a )
* outputting apart from the gsf_output_write() above. * outputting apart from the gsf_output_write() above.
*/ */
if( dz->container == VIPS_FOREIGN_DZ_CONTAINER_ZIP && if( dz->container == VIPS_FOREIGN_DZ_CONTAINER_ZIP &&
!vips_gsf_has_zip64() &&
dz->bytes_written > (size_t) UINT_MAX - 100000 ) { dz->bytes_written > (size_t) UINT_MAX - 100000 ) {
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( vips__global_lock );