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

fix build with older libgsf

Browse Source 
build on libgsf without zip64 support was broken, thanks @remicollet

see https://github.com/libvips/libvips/issues/2878
This commit is contained in:
John Cupitt 2022-06-20 13:19:35 +01:00
parent a129476f0f
commit e9414f8d8f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libvips/foreign/dzsave.c
View File

@ -678,6 +678,21 @@ G_DEFINE_ABSTRACT_TYPE( VipsForeignSaveDz, vips_foreign_save_dz,
#define VIPS_ZIP_EOCD_SIZE 22 #define VIPS_ZIP_EOCD_SIZE 22
#ifndef HAVE_GSF_ZIP64 #ifndef HAVE_GSF_ZIP64
/* ZIP and SZI are both written as zip files.
*/
static gboolean
iszip( VipsForeignDzContainer container )
{
switch( container ) {
case VIPS_FOREIGN_DZ_CONTAINER_ZIP:
case VIPS_FOREIGN_DZ_CONTAINER_SZI:
return( TRUE );
default:
return( FALSE );
}
}
static size_t static size_t
estimate_zip_size( VipsForeignSaveDz *dz ) estimate_zip_size( VipsForeignSaveDz *dz )
{ {
@ -744,7 +759,7 @@ write_image( VipsForeignSaveDz *dz,
gsf_output_close( out ); gsf_output_close( out );
#ifndef HAVE_GSF_ZIP64 #ifndef HAVE_GSF_ZIP64
if( iszip( dz->container ) ) { if( iszip( dz->container ) ) {
/* Leave 3 entry headroom for blank.png and metadata files. /* Leave 3 entry headroom for blank.png and metadata files.
*/ */
if( dz->tree->file_count + 3 >= (unsigned int) USHRT_MAX ) { if( dz->tree->file_count + 3 >= (unsigned int) USHRT_MAX ) {