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

jpeg read is less fussy about exif data

Browse Source 
even read truncated exif
This commit is contained in:
John Cupitt 2012-11-21 18:34:20 +00:00
parent 006d4ece17
commit 65b4056c84
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,3 +1,4 @@
- look into preserving IPTC data
- check libtool version number, should be binary-compat with 7.30 - check libtool version number, should be binary-compat with 7.30

41
libvips/foreign/jpeg2vips.c
View File

@ -79,9 +79,9 @@
*/ */
/* /*
*/
#define DEBUG_VERBOSE #define DEBUG_VERBOSE
#define DEBUG #define DEBUG
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -598,39 +598,36 @@ read_exif( VipsImage *im, void *data, int data_length )
#ifdef HAVE_EXIF #ifdef HAVE_EXIF
{ {
ExifData *ed; ExifData *ed;
VipsExif ve;
if( !(ed = exif_data_new_from_data( data, data_length )) ) if( !(ed = exif_data_new_from_data( data, data_length )) )
return( -1 ); return( -1 );
if( ed->size > 0 ) {
VipsExif ve;
#ifdef DEBUG_VERBOSE #ifdef DEBUG_VERBOSE
show_tags( ed ); show_tags( ed );
show_values( ed ); show_values( ed );
#endif /*DEBUG_VERBOSE*/ #endif /*DEBUG_VERBOSE*/
/* Attach informational fields for what we find. /* Attach informational fields for what we find.
FIXME ... better to have this in the UI layer? FIXME ... better to have this in the UI layer?
Or we could attach non-human-readable tags here (int, Or we could attach non-human-readable tags here (int,
double etc) and then move the human stuff to the UI double etc) and then move the human stuff to the UI
layer? layer?
*/ */
ve.image = im; ve.image = im;
ve.ed = ed; ve.ed = ed;
exif_data_foreach_content( ed, exif_data_foreach_content( ed,
(ExifDataForeachContentFunc) attach_exif_content, &ve ); (ExifDataForeachContentFunc) attach_exif_content, &ve );
/* Look for resolution fields and use them to set the VIPS /* Look for resolution fields and use them to set the VIPS
* xres/yres fields. * xres/yres fields.
*/ */
set_vips_resolution( im, ed ); set_vips_resolution( im, ed );
attach_thumbnail( im, ed ); attach_thumbnail( im, ed );
}
exif_data_free( ed ); exif_data_free( ed );
} }