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

dzsave to szi sets extension correctly 

see https://github.com/jcupitt/libvips/issues/852
This commit is contained in:
John Cupitt 2018-01-26 15:36:43 +00:00
parent 2cd606bdb2
commit c46f4b15e0
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
23/12/17 started 8.7.0
- add magicksave, save image with libMagick [dlemstra]
- dzsave to szi sets suffix correctly [martinweihrauch]
5/1/18 started 8.6.2
- vips_sink_screen() keeps a ref to the input image ... stops a rare race

21
libvips/foreign/dzsave.c
View File

@ -527,6 +527,11 @@ struct _VipsForeignSaveDz {
*/
VipsPel *ink;
/* TRUE if we are writing a .szi file. These are zips with a few
* extra files inside.
*/
gboolean write_szi;
};
typedef VipsForeignSaveClass VipsForeignSaveDzClass;
@ -1857,9 +1862,11 @@ vips_foreign_save_dz_build( VipsObject *object )
/* Output to a file or memory?
*/
if( dz->dirname ) {
vips_snprintf( name, VIPS_PATH_MAX, "%s/%s.zip",
dz->dirname, dz->basename );
if( !(dz->out = gsf_output_stdio_new( name, &error )) ) {
const char *suffix = dz->write_szi ? "szi" : "zip";
vips_snprintf( name, VIPS_PATH_MAX, "%s/%s.%s",
dz->dirname, dz->basename, suffix );
if( !(dz->out =
gsf_output_stdio_new( name, &error )) ) {
vips_g_error( &error );
return( -1 );
}
@ -2176,11 +2183,17 @@ vips_foreign_save_dz_file_build( VipsObject *object )
* container.
*/
if( (p = strrchr( dz->basename, '.' )) ) {
if( !vips_object_argument_isset( object, "container" ) )
if( !vips_object_argument_isset( object, "container" ) ) {
if( strcasecmp( p + 1, "zip" ) == 0 ||
strcasecmp( p + 1, "szi" ) == 0 )
dz->container = VIPS_FOREIGN_DZ_CONTAINER_ZIP;
/* Note we are building a .szi object.
*/
if( strcasecmp( p + 1, "szi" ) == 0 )
dz->write_szi = TRUE;
}
/* Remove any legal suffix. We don't remove all suffixes
* since we might be writing to a dirname with a dot in.
*/