Merge branch '8.13'
This commit is contained in:
John Cupitt
commit
ab2e0bf38c
|
|
@ -14,6 +14,9 @@ master
|
|||
- threaded tiff jp2k and jpeg decompress
|
||||
- improve speed and efficiency of animated WebP write [dloebl]
|
||||
|
||||
11/10/22 started 8.13.3
|
||||
- improve rules for 16-bit heifsave [johntrunc]
|
||||
|
||||
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]
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
* - rename "speed" as "effort" for consistency with other savers
|
||||
* 22/12/21
|
||||
* - add >8 bit support
|
||||
* 22/10/11
|
||||
* - improve rules for 16-bit write [johntrunc]
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -48,21 +50,6 @@
|
|||
#define DEBUG
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
|
||||
TODO:
|
||||
|
||||
what about a 16-bit PNG saved with bitdepth=8? does this work?
|
||||
|
||||
no!
|
||||
|
||||
what about a 8-bit PNG saved with bitdepth=12? does this work?
|
||||
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif /*HAVE_CONFIG_H*/
|
||||
|
|
@ -320,7 +307,7 @@ vips_foreign_save_heif_pack( VipsForeignSaveHeif *heif,
|
|||
|
||||
if( heif->image->BandFmt == VIPS_FORMAT_UCHAR &&
|
||||
heif->bitdepth == 8 )
|
||||
/* Most common cases -- 8 bit to 8 bit.
|
||||
/* Most common case -- 8 bit to 8 bit.
|
||||
*/
|
||||
memcpy( q, p, ne );
|
||||
else if( heif->image->BandFmt == VIPS_FORMAT_UCHAR &&
|
||||
|
|
@ -341,8 +328,14 @@ vips_foreign_save_heif_pack( VipsForeignSaveHeif *heif,
|
|||
else if( heif->image->BandFmt == VIPS_FORMAT_USHORT &&
|
||||
heif->bitdepth <= 8 ) {
|
||||
/* 16-bit native byte order source, 8 bit write.
|
||||
*/
|
||||
int shift = 16 - heif->bitdepth;
|
||||
*
|
||||
* Pick the high or low bits of the source.
|
||||
*/
|
||||
int vips_bitdepth =
|
||||
heif->image->Type == VIPS_INTERPRETATION_RGB16 ||
|
||||
heif->image->Type == VIPS_INTERPRETATION_GREY16 ?
|
||||
16 : 8;
|
||||
int shift = vips_bitdepth - heif->bitdepth;
|
||||
|
||||
for( i = 0; i < ne; i++ ) {
|
||||
guint16 v = *((gushort *) p) >> shift;
|
||||
|
|
@ -356,7 +349,11 @@ vips_foreign_save_heif_pack( VipsForeignSaveHeif *heif,
|
|||
heif->bitdepth > 8 ) {
|
||||
/* 16-bit native byte order source, 16 bit bigendian write.
|
||||
*/
|
||||
int shift = 16 - heif->bitdepth;
|
||||
int vips_bitdepth =
|
||||
heif->image->Type == VIPS_INTERPRETATION_RGB16 ||
|
||||
heif->image->Type == VIPS_INTERPRETATION_GREY16 ?
|
||||
16 : 8;
|
||||
int shift = vips_bitdepth - heif->bitdepth;
|
||||
|
||||
for( i = 0; i < ne; i++ ) {
|
||||
guint16 v = *((gushort *) p) >> shift;
|
||||
|
|
@ -446,6 +443,12 @@ vips_foreign_save_heif_build( VipsObject *object )
|
|||
build( object ) )
|
||||
return( -1 );
|
||||
|
||||
/* Make a copy of the image in case we modify the metadata eg. for
|
||||
* exif_update.
|
||||
*/
|
||||
if( vips_copy( save->ready, &heif->image, NULL ) )
|
||||
return( -1 );
|
||||
|
||||
/* If the old, deprecated "speed" param is being used and the new
|
||||
* "effort" param is not, use speed to init effort.
|
||||
*/
|
||||
|
|
@ -453,18 +456,14 @@ vips_foreign_save_heif_build( VipsObject *object )
|
|||
!vips_object_argument_isset( object, "effort" ) )
|
||||
heif->effort = 9 - heif->speed;
|
||||
|
||||
/* Default 12 bit save for ushort. HEIC (for example) implements
|
||||
/* Default 12 bit save for 16-bit images. HEIC (for example) implements
|
||||
* 8 / 10 / 12.
|
||||
*/
|
||||
if( !vips_object_argument_isset( object, "bitdepth" ) )
|
||||
heif->bitdepth = save->ready->BandFmt == VIPS_FORMAT_UCHAR ?
|
||||
8 : 12;
|
||||
|
||||
/* Make a copy of the image in case we modify the metadata eg. for
|
||||
* exif_update.
|
||||
*/
|
||||
if( vips_copy( save->ready, &heif->image, NULL ) )
|
||||
return( -1 );
|
||||
heif->bitdepth =
|
||||
heif->image->Type == VIPS_INTERPRETATION_RGB16 ||
|
||||
heif->image->Type == VIPS_INTERPRETATION_GREY16 ?
|
||||
12 : 8;
|
||||
|
||||
error = heif_context_get_encoder_for_format( heif->ctx,
|
||||
(enum heif_compression_format) heif->compression,
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ version_patch = version_parts[2]
|
|||
# binary interface changed: increment current, reset revision to 0
|
||||
# binary interface changes backwards compatible?: increment age
|
||||
# binary interface changes not backwards compatible?: reset age to 0
|
||||
library_revision = 0
|
||||
library_current = 58
|
||||
library_age = 16
|
||||
library_revision = 0
|
||||
library_version = '@0@.@1@.@2@'.format(library_current - library_age, library_age, library_revision)
|
||||
darwin_versions = [library_current + 1, '@0@.@1@'.format(library_current + 1, library_revision)]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue