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-22 14:11:31 +01:00
commit eed0e5b43c
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ master
- revise caching of seq mode loaders [jcupitt] - revise caching of seq mode loaders [jcupitt]
- reduce latency on dzsave kill [kleisauke] - reduce latency on dzsave kill [kleisauke]
- improve text too large check [kleisauke] - improve text too large check [kleisauke]
- fix subifd writing for small images [ruven]
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

25
libvips/foreign/vips2tiff.c
View File

@ -2115,26 +2115,29 @@ wtiff_page_start( Wtiff *wtiff )
*/ */
if( wtiff->subifd ) { if( wtiff->subifd ) {
int n_layers; int n_layers;
toff_t *subifd_offsets;
Layer *p; Layer *p;
#ifdef DEBUG #ifdef DEBUG
printf( "wtiff_write_page: OME pyr mode\n" ); printf( "wtiff_write_page: OME pyr mode\n" );
#endif /*DEBUG*/ #endif /*DEBUG*/
/* This magic tag makes the n_layers directories we write
* after this one into subdirectories. We set the offsets to 0
* and libtiff will fill them in automatically.
*/
for( n_layers = 0, p = wtiff->layer->below; p; p = p->below ) for( n_layers = 0, p = wtiff->layer->below; p; p = p->below )
n_layers += 1; n_layers += 1;
if( n_layers > 0 ){ if( n_layers > 0 ) {
subifd_offsets = VIPS_ARRAY( NULL, n_layers, toff_t ); toff_t *subifd_offsets;
memset( subifd_offsets, 0, n_layers * sizeof( toff_t ) );
TIFFSetField( wtiff->layer->tif, TIFFTAG_SUBIFD, /* This magic tag makes the n_layers directories we
n_layers, subifd_offsets ); * write after this one into subdirectories. We set
g_free( subifd_offsets ); * the offsets to 0 and libtiff will fill them in
* automatically.
*/
subifd_offsets = VIPS_ARRAY( NULL, n_layers, toff_t );
memset( subifd_offsets,
0, n_layers * sizeof( toff_t ) );
TIFFSetField( wtiff->layer->tif, TIFFTAG_SUBIFD,
n_layers, subifd_offsets );
g_free( subifd_offsets );
} }
} }