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

more vipsthumbnail --rotate work

Browse Source 
now needs some changes to jpegsave
This commit is contained in:
John Cupitt 2014-03-06 22:41:56 +00:00
parent ea1aeaec8c
commit fce4f2d1ef
2 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -1,4 +1,8 @@
- vipsthumbnail needs an auto-rotate flag
- we vips_image_remove() orientation, but it gets put back from the exif block
on jpegsave
jpegsave needs to remove again after reconstituting the exif
- think of a better way to support skipahead

58
tools/vipsthumbnail.c
View File

@ -44,6 +44,8 @@
* - add --crop option
* 5/3/14
* - copy main image metadata to embedded thumbnails, thanks ottob
* 6/3/14
* - add --rotate flag
*/
#ifdef HAVE_CONFIG_H
@ -137,10 +139,11 @@ get_angle( VipsImage *im )
angle = VIPS_ANGLE_0;
if( vips_image_get_typeof( im, ORIENTATION ) &&
vips_image_get_string( im, ORIENTATION, &orientation ) ) {
if( vips_isprefix( "6", orientation ) )
angle = VIPS_ANGLE_90;
if( vips_image_get_typeof( im, ORIENTATION ) ) {
if( vips_image_get_string( im, ORIENTATION, &orientation ) ) {
if( vips_isprefix( "6", orientation ) )
angle = VIPS_ANGLE_90;
}
}
return( angle );
@ -237,21 +240,41 @@ copy_jpeg_field( VipsImage *from, const char *field, GValue *value, void *a )
/* Try to read an embedded thumbnail.
*/
static VipsImage *
thumbnail_get_thumbnail( VipsImage *im )
thumbnail_get_thumbnail( VipsImage *im, int jpegshrink )
{
void *ptr;
size_t size;
VipsImage *thumb;
double residual;
int jpegshrink;
if( !vips_image_get_typeof( im, THUMBNAIL ) ||
vips_image_get_blob( im, THUMBNAIL, &ptr, &size ) ||
vips_jpegload_buffer( ptr, size, &thumb, NULL ) ) {
vips_jpegload_buffer( ptr, size, &thumb,
"shrink", jpegshrink,
NULL ) ) {
vips_info( "vipsthumbnail", "no jpeg thumbnail" );
return( NULL );
}
/* Copy over the metadata from the main image. We want our thumbnail
* to have the orientation, profile etc. from there.
*/
(void) vips_image_map( im, copy_jpeg_field, thumb );
return( thumb );
}
/* Get an embedded thumb with the appropriate shrink.
*/
static VipsImage *
thumbnail_get_thumbnail_shrink( VipsImage *im )
{
VipsImage *thumb;
double residual;
int jpegshrink;
if( !(thumb = thumbnail_get_thumbnail( im, 1 )) )
return( NULL );
calculate_shrink( thumb, &residual );
if( residual > 1.0 ) {
vips_info( "vipsthumbnail", "jpeg thumbnail too small" );
@ -266,17 +289,9 @@ thumbnail_get_thumbnail( VipsImage *im )
"loading jpeg thumbnail with factor %d pre-shrink",
jpegshrink );
g_object_unref( thumb );
if( vips_jpegload_buffer( ptr, size, &thumb,
"shrink", jpegshrink,
NULL ) ) {
vips_info( "vipsthumbnail", "jpeg thumbnail reload failed" );
return( NULL );
}
/* Copy over the metadata from the main image. We want our thumbnail
* to have the orientation, profile etc. from there.
*/
(void) vips_image_map( im, copy_jpeg_field, thumb );
if( !(thumb = thumbnail_get_thumbnail( im, jpegshrink )) )
return( NULL );
vips_info( "vipsthumbnail", "using %dx%d jpeg thumbnail",
thumb->Xsize, thumb->Ysize );
@ -318,7 +333,7 @@ thumbnail_open( VipsObject *process, const char *filename )
/* Try to read an embedded thumbnail. If we find one, use that
* instead.
*/
if( (thumb = thumbnail_get_thumbnail( im )) ) {
if( (thumb = thumbnail_get_thumbnail_shrink( im )) ) {
/* @thumb has not been fully decoded yet ...
* we must not close @im
* until we're done with @thumb.
@ -614,12 +629,15 @@ thumbnail_crop( VipsObject *process, VipsImage *im )
static VipsImage *
thumbnail_rotate( VipsObject *process, VipsImage *im )
{
VipsImage **t = (VipsImage **) vips_object_local_array( process, 2 );
VipsImage **t = (VipsImage **) vips_object_local_array( process, 1 );
if( rotate_image ) {
if( vips_rot( im, &t[0], get_angle( im ), NULL ) )
return( NULL );
im = t[0];
if( !vips_image_remove( im, ORIENTATION ) )
return( NULL );
}
return( im );