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

Merge branch '8.5'

Browse Source
This commit is contained in:
John Cupitt 2017-04-26 10:31:33 +01:00
commit b0f8246c90
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
23/4/17 started 8.5.5 23/4/17 started 8.5.5
- doc polishing - doc polishing
- more improvements for tuncated PNG files, thanks juyunsang
23/4/17 started 8.5.4 23/4/17 started 8.5.4
- don't depend on image width when setting n_lines, thanks kleisauke - don't depend on image width when setting n_lines, thanks kleisauke

2
autogen.sh
View File

@ -16,7 +16,7 @@ rm -f m4/gtk-doc.m4
rm -f config.* configure depcomp rm -f config.* configure depcomp
rm -f install-sh intltool-* libtool ltmain.sh missing mkinstalldirs rm -f install-sh intltool-* libtool ltmain.sh missing mkinstalldirs
rm -f stamp-* vipsCC-7.19.pc vips-7.19.spec vips-7.19.pc rm -f stamp-*
rm -f swig/vipsCC/*.cxx rm -f swig/vipsCC/*.cxx
rm -f swig/vipsCC/VImage.h rm -f swig/vipsCC/VImage.h
rm -f swig/vipsCC/VImage.py python/vipsCC/VError.py python/vipsCC/VMask.py python/vipsCC/Display.py rm -f swig/vipsCC/VImage.py python/vipsCC/VError.py python/vipsCC/VMask.py python/vipsCC/Display.py

1
doc/libvips-docs.xml.in
View File

@ -45,6 +45,7 @@
<xi:include href="xml/Using-vipsthumbnail.xml"/> <xi:include href="xml/Using-vipsthumbnail.xml"/>
<xi:include href="xml/Cite.xml"/> <xi:include href="xml/Cite.xml"/>
<xi:include href="xml/Examples.xml"/> <xi:include href="xml/Examples.xml"/>
<xi:include href="xml/Cite.xml"/>
</chapter> </chapter>
<chapter> <chapter>

11
libvips/foreign/vipspng.c
View File

@ -63,6 +63,8 @@
* - use dbuf for buffer output * - use dbuf for buffer output
* 30/3/17 * 30/3/17
* - better behaviour for truncated png files, thanks Yury * - better behaviour for truncated png files, thanks Yury
* 26/4/17
* - better @fail handling with truncated PNGs
*/ */
/* /*
@ -127,8 +129,8 @@ user_error_function( png_structp png_ptr, png_const_charp error_msg )
/* This function must not return or the default error handler will be /* This function must not return or the default error handler will be
* invoked. * invoked.
longjmp( png_jmpbuf( png_ptr ), -1 );
*/ */
longjmp( png_jmpbuf( png_ptr ), -1 );
} }
static void static void
@ -409,7 +411,7 @@ png2vips_header( Read *read, VipsImage *out )
void *profile_copy; void *profile_copy;
#ifdef DEBUG #ifdef DEBUG
printf( "png2vips_header: attaching %zd bytes of ICC profile\n", printf( "png2vips_header: attaching %d bytes of ICC profile\n",
proflen ); proflen );
printf( "png2vips_header: name = \"%s\"\n", name ); printf( "png2vips_header: name = \"%s\"\n", name );
#endif /*DEBUG*/ #endif /*DEBUG*/
@ -538,6 +540,11 @@ png2vips_generate( VipsRegion *or,
printf( "png2vips_generate: thread %p\n", printf( "png2vips_generate: thread %p\n",
g_thread_self() ); g_thread_self() );
#endif /*DEBUG*/ #endif /*DEBUG*/
/* ... except if fail is on, in which case we bail out.
*/
if( read->fail )
return( -1 );
} }
read->y_pos += 1; read->y_pos += 1;