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

Merge branch 'master' of github.com:jcupitt/libvips

Browse Source
This commit is contained in:
John Cupitt 2014-03-06 16:04:05 +00:00
commit 7ed644789c
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,7 +8,7 @@
im_draw_smudge(), im_label_regions() as classes im_draw_smudge(), im_label_regions() as classes
- better rounding in vips_flatten() - better rounding in vips_flatten()
- VipsStatistic operations are sequential - VipsStatistic operations are sequential
- VipsLinear has optional complex constants, added vips_linear_complex() etc. - vipsthumbnail attaches main image metadata to embedded thumbnails
6/3/14 started 7.38.6 6/3/14 started 7.38.6
- grey ramp minimum was wrong - grey ramp minimum was wrong

37
tools/vipsthumbnail.c
View File

@ -42,6 +42,8 @@
* - add --linear option * - add --linear option
* 18/12/13 * 18/12/13
* - add --crop option * - add --crop option
* 5/3/14
* - copy main image metadata to embedded thumbnails, thanks ottob
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -189,32 +191,16 @@ thumbnail_find_jpegshrink( VipsImage *im )
#define THUMBNAIL "jpeg-thumbnail-data" #define THUMBNAIL "jpeg-thumbnail-data"
/* Copy a blob from one image to another.
*
* We don't make a private copy of the blob, we just copy pointers. Therefore
* @from must stay alive as long as @to is alive.
*/
static int
copy_blob( VipsImage *from, VipsImage *to, const char *field )
{
if( vips_image_get_typeof( from, field ) ) {
void *blob;
size_t blob_length;
if( vips_image_get_blob( from, field, &blob, &blob_length ) )
return( -1 );
vips_image_set_blob( to, field, NULL, blob, blob_length );
}
return( 0 );
}
static void * static void *
copy_exif_field( VipsImage *from, const char *field, GValue *value, void *a ) copy_jpeg_field( VipsImage *from, const char *field, GValue *value, void *a )
{ {
VipsImage *to = (VipsImage *) a; VipsImage *to = (VipsImage *) a;
if( vips_isprefix( "exif-", field ) ) if( vips_isprefix( "exif-", field ) ||
strcmp( field, VIPS_META_EXIF_NAME ) == 0 ||
strcmp( field, VIPS_META_XMP_NAME ) == 0 ||
strcmp( field, VIPS_META_IPCT_NAME ) == 0 ||
strcmp( field, VIPS_META_ICC_NAME ) == 0 )
vips_image_set( to, field, value ); vips_image_set( to, field, value );
return( NULL ); return( NULL );
@ -262,12 +248,7 @@ thumbnail_get_thumbnail( VipsImage *im )
/* Copy over the metadata from the main image. We want our thumbnail /* Copy over the metadata from the main image. We want our thumbnail
* to have the orientation, profile etc. from there. * to have the orientation, profile etc. from there.
*/ */
if( copy_blob( im, thumb, VIPS_META_EXIF_NAME ) || (void) vips_image_map( im, copy_jpeg_field, thumb );
copy_blob( im, thumb, VIPS_META_XMP_NAME ) ||
copy_blob( im, thumb, VIPS_META_IPCT_NAME ) ||
copy_blob( im, thumb, VIPS_META_ICC_NAME ) )
return( NULL );
(void) vips_image_map( im, copy_exif_field, thumb );
vips_info( "vipsthumbnail", "using %dx%d jpeg thumbnail", vips_info( "vipsthumbnail", "using %dx%d jpeg thumbnail",
thumb->Xsize, thumb->Ysize ); thumb->Xsize, thumb->Ysize );