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

thumbnail no longer needs to import cmyk

Browse Source 
since colourspace knows about cmyk now
This commit is contained in:
John Cupitt 2019-04-23 11:35:13 +01:00
parent 12bc5fbbe3
commit 56d98f3ef0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvips/iofuncs/init.c
View File

@ -291,13 +291,14 @@ set_stacksize( guint64 size )
return; return;
} }
if( cur_stack_size < size ) if( cur_stack_size < size ) {
if( pthread_attr_setstacksize( &attr, size ) || if( pthread_attr_setstacksize( &attr, size ) ||
pthread_setattr_default_np( &attr ) ) pthread_setattr_default_np( &attr ) )
g_warning( "set_stacksize: unable to set stack size" ); g_warning( "set_stacksize: unable to set stack size" );
else else
g_info( "set stack size to %" G_GUINT64_FORMAT "k", g_info( "set stack size to %" G_GUINT64_FORMAT "k",
size / (guint64) 1024 ); size / (guint64) 1024 );
}
#endif /*HAVE_PTHREAD_DEFAULT_NP*/ #endif /*HAVE_PTHREAD_DEFAULT_NP*/
} }

8
libvips/resample/thumbnail.c
View File

@ -18,6 +18,8 @@
* - implement shrink-on-load for tiff pyramid * - implement shrink-on-load for tiff pyramid
* 3/2/19 kleisauke * 3/2/19 kleisauke
* - add option_string param to thumbnail_buffer * - add option_string param to thumbnail_buffer
* 23/4/19
* - don't force import CMYK, since colourspace knows about it now
*/ */
/* /*
@ -567,17 +569,13 @@ vips_thumbnail_build( VipsObject *object )
} }
/* In linear mode, we import right at the start. /* In linear mode, we import right at the start.
*
* We also have to import the whole image if it's CMYK, since
* vips_colourspace() (see below) doesn't know about CMYK.
* *
* This is only going to work for images in device space. If you have * This is only going to work for images in device space. If you have
* an image in PCS which also has an attached profile, strange things * an image in PCS which also has an attached profile, strange things
* will happen. * will happen.
*/ */
have_imported = FALSE; have_imported = FALSE;
if( (thumbnail->linear || if( thumbnail->linear &&
in->Type == VIPS_INTERPRETATION_CMYK) &&
in->Coding == VIPS_CODING_NONE && in->Coding == VIPS_CODING_NONE &&
(in->BandFmt == VIPS_FORMAT_UCHAR || (in->BandFmt == VIPS_FORMAT_UCHAR ||
in->BandFmt == VIPS_FORMAT_USHORT) && in->BandFmt == VIPS_FORMAT_USHORT) &&