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

Merge branch '7.40'

Browse Source 
Conflicts:
	ChangeLog
	configure.ac
This commit is contained in:
John Cupitt 2014-09-09 16:58:28 +01:00
commit 2ec0a8b87e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@
- return of vips_init(), but just for bindings - return of vips_init(), but just for bindings
- revised type.c to make it more binding-friendly - revised type.c to make it more binding-friendly
8/9/14 started 7.40.9
- support jfif resunit "none"
8/9/14 started 7.40.8 8/9/14 started 7.40.8
- fix configure on rhel6 [Lovell] - fix configure on rhel6 [Lovell]
- mono <-> rgb converters were not handling extra bands, thanks James - mono <-> rgb converters were not handling extra bands, thanks James

7
libvips/foreign/jpeg2vips.c
View File

@ -744,6 +744,13 @@ read_jpeg_header( ReadJpeg *jpeg, VipsImage *out )
#endif /*DEBUG*/ #endif /*DEBUG*/
switch( cinfo->density_unit ) { switch( cinfo->density_unit ) {
case 0:
/* None. Just set.
*/
xres = cinfo->X_density;
yres = cinfo->Y_density;
break;
case 1: case 1:
/* Pixels per inch. /* Pixels per inch.
*/ */