Merge branch '8.13'
This commit is contained in:
commit
75bd19759f
@ -18,6 +18,8 @@ master
|
||||
5/9/22 started 8.13.2
|
||||
- in dzsave, add add missing include directive for errno/EEXIST [kleisauke]
|
||||
- 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
|
||||
- fix im7 feature detection in meson
|
||||
|
@ -1044,7 +1044,6 @@ vips_foreign_load_build( VipsObject *object )
|
||||
VipsForeignLoadClass *fclass = VIPS_FOREIGN_LOAD_GET_CLASS( object );
|
||||
|
||||
VipsForeignFlags flags;
|
||||
gboolean sequential;
|
||||
|
||||
#ifdef DEBUG
|
||||
printf( "vips_foreign_load_build:\n" );
|
||||
@ -1064,14 +1063,12 @@ vips_foreign_load_build( VipsObject *object )
|
||||
|
||||
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) ||
|
||||
load->access != VIPS_ACCESS_RANDOM;
|
||||
|
||||
/* We must block caching of seq loads.
|
||||
*/
|
||||
if( sequential )
|
||||
if( (load->flags & VIPS_FOREIGN_SEQUENTIAL) &&
|
||||
load->access != VIPS_ACCESS_RANDOM )
|
||||
load->nocache = TRUE;
|
||||
|
||||
/* The deprecated "fail" field sets fail_on warning.
|
||||
@ -1134,9 +1131,9 @@ vips_foreign_load_build( VipsObject *object )
|
||||
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 );
|
||||
|
||||
return( 0 );
|
||||
|
@ -245,7 +245,7 @@ vips_foreign_save_jxl_build( VipsObject *object )
|
||||
if( !vips_object_argument_isset( object, "distance" ) )
|
||||
jxl->distance = jxl->Q >= 30 ?
|
||||
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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user