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

Merge branch '8.13'

Browse Source
This commit is contained in:
John Cupitt 2022-09-20 10:04:22 +01:00
commit 75bd19759f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18,6 +18,8 @@ master
5/9/22 started 8.13.2 5/9/22 started 8.13.2
- in dzsave, add add missing include directive for errno/EEXIST [kleisauke] - in dzsave, add add missing include directive for errno/EEXIST [kleisauke]
- fix 8 bit pallete PNG save [lovell] - fix 8 bit pallete PNG save [lovell]
- fix null string in buffer print [pclewis]
- revise caching of seq mode loaders [jcupitt]
24/7/22 started 8.13.1 24/7/22 started 8.13.1
- fix im7 feature detection in meson - fix im7 feature detection in meson

17
libvips/foreign/foreign.c
View File

@ -1044,7 +1044,6 @@ vips_foreign_load_build( VipsObject *object )
VipsForeignLoadClass *fclass = VIPS_FOREIGN_LOAD_GET_CLASS( object ); VipsForeignLoadClass *fclass = VIPS_FOREIGN_LOAD_GET_CLASS( object );
VipsForeignFlags flags; VipsForeignFlags flags;
gboolean sequential;
#ifdef DEBUG #ifdef DEBUG
printf( "vips_foreign_load_build:\n" ); printf( "vips_foreign_load_build:\n" );
@ -1064,14 +1063,12 @@ vips_foreign_load_build( VipsObject *object )
g_object_set( load, "flags", flags, NULL ); g_object_set( load, "flags", flags, NULL );
/* Seq access has been requested, or the loader requires seq. /* We must block caching of seq loaders running in seq mode. A seq
* loader in random mode is fine, since we'll read to ram or a temp
* file.
*/ */
sequential = (load->flags & VIPS_FOREIGN_SEQUENTIAL) || if( (load->flags & VIPS_FOREIGN_SEQUENTIAL) &&
load->access != VIPS_ACCESS_RANDOM; load->access != VIPS_ACCESS_RANDOM )
/* We must block caching of seq loads.
*/
if( sequential )
load->nocache = TRUE; load->nocache = TRUE;
/* The deprecated "fail" field sets fail_on warning. /* The deprecated "fail" field sets fail_on warning.
@ -1134,9 +1131,9 @@ vips_foreign_load_build( VipsObject *object )
return( -1 ); return( -1 );
} }
/* Tell downstream if we are reading sequentially. /* Tell downstream if seq mode was requested.
*/ */
if( sequential ) if( load->access != VIPS_ACCESS_RANDOM )
vips_image_set_int( load->out, VIPS_META_SEQUENTIAL, 1 ); vips_image_set_int( load->out, VIPS_META_SEQUENTIAL, 1 );
return( 0 ); return( 0 );

2
libvips/foreign/jxlsave.c
View File

@ -245,7 +245,7 @@ vips_foreign_save_jxl_build( VipsObject *object )
if( !vips_object_argument_isset( object, "distance" ) ) if( !vips_object_argument_isset( object, "distance" ) )
jxl->distance = jxl->Q >= 30 ? jxl->distance = jxl->Q >= 30 ?
0.1 + (100 - jxl->Q) * 0.09 : 0.1 + (100 - jxl->Q) * 0.09 :
6.4 + pow(2.5, (30 - jxl->Q) / 5.0f) / 6.25f; 6.24 + pow(2.5, (30 - jxl->Q) / 5.0f) / 6.25f;
/* Distance 0 is lossless. libjxl will fail for lossy distance 0. /* Distance 0 is lossless. libjxl will fail for lossy distance 0.
*/ */