Merge branch 'master' into add-magick7
This commit is contained in:
John Cupitt
commit
40f01fdb2b
@ -30,6 +30,12 @@
|
||||
- add imagemagick v7 support, thanks sachinwalia2k8
|
||||
- added vips_worley(), vips_perlin() noise generators
|
||||
- gif loader can write 1, 2, 3, or 4 bands depending on file contents
|
||||
- support --strip for pngsave
|
||||
- add svgz support [Felix Bünemann]
|
||||
|
||||
30/7/16 started 8.3.3
|
||||
- fix performance regression in 8.3.2, thanks Lovell
|
||||
- yet more robust vips file reading
|
||||
|
||||
18/5/16 started 8.3.2
|
||||
- more robust vips image reading
|
||||
|
||||
31
TODO
31
TODO
@ -1,24 +1,3 @@
|
||||
- dicom fails
|
||||
|
||||
ping:
|
||||
image->depth = 8
|
||||
GetImageType() = 6
|
||||
TrueColorType
|
||||
GetPixelChannels() = 3
|
||||
image->columns = 128
|
||||
image->rows = 128
|
||||
image has 1 frames
|
||||
|
||||
read:
|
||||
image->depth = 16
|
||||
GetImageType() = 2
|
||||
GrayscaleType
|
||||
GetPixelChannels() = 2
|
||||
image->columns = 128
|
||||
image->rows = 128
|
||||
image has 1 frames
|
||||
|
||||
see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=30191
|
||||
|
||||
- add tests:
|
||||
|
||||
@ -31,6 +10,16 @@
|
||||
all with file and buffer source
|
||||
|
||||
|
||||
- try:
|
||||
|
||||
$ vips avg broken.jpg[fail]
|
||||
|
||||
about 50% of the time it'll trigger a range of out-of-order reads and lock
|
||||
for 10s or so while seq times out
|
||||
|
||||
- add more webp tests to py suite
|
||||
|
||||
- try moving some more of the CLI tests to py
|
||||
|
||||
|
||||
|
||||
|
||||
41
configure.ac
41
configure.ac
@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
|
||||
# binary interface changes not backwards compatible?: reset age to 0
|
||||
|
||||
LIBRARY_CURRENT=46
|
||||
LIBRARY_REVISION=2
|
||||
LIBRARY_REVISION=3
|
||||
LIBRARY_AGE=4
|
||||
|
||||
# patched into include/vips/version.h
|
||||
@ -637,6 +637,29 @@ if test x"$with_rsvg" != x"no"; then
|
||||
)
|
||||
fi
|
||||
|
||||
# zlib
|
||||
# some platforms, like macosx, are missing the .pc files for zlib, so
|
||||
# we fall back to FIND_ZLIB
|
||||
AC_ARG_WITH([zlib],
|
||||
AS_HELP_STRING([--without-zlib], [build without zlib (default: test)]))
|
||||
|
||||
if test x"$with_zlib" != "xno"; then
|
||||
PKG_CHECK_MODULES(ZLIB, zlib >= 0.4,
|
||||
[AC_DEFINE(HAVE_ZLIB,1,[define if you have zlib installed.])
|
||||
with_zlib=yes
|
||||
PACKAGES_USED="$PACKAGES_USED zlib"
|
||||
],
|
||||
[FIND_ZLIB(
|
||||
[with_zlib="yes (found by search)"
|
||||
],
|
||||
[AC_MSG_WARN([zlib not found; disabling SVGZ buffer support])
|
||||
with_zlib=no
|
||||
]
|
||||
)
|
||||
]
|
||||
)
|
||||
fi
|
||||
|
||||
# OpenSlide
|
||||
AC_ARG_WITH([openslide],
|
||||
AS_HELP_STRING([--without-openslide],
|
||||
@ -797,15 +820,6 @@ fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = x"yes")
|
||||
|
||||
# hmm, these don't have .pc files on ubuntu 5.10, how odd
|
||||
FIND_ZIP(
|
||||
[with_zip=yes
|
||||
],
|
||||
[AC_MSG_WARN([libz not found; disabling ZIP support])
|
||||
with_zip=no
|
||||
]
|
||||
)
|
||||
|
||||
# look for TIFF with pkg-config ... fall back to our tester
|
||||
# pkgconfig support for libtiff starts with libtiff-4
|
||||
AC_ARG_WITH([tiff],
|
||||
@ -954,14 +968,14 @@ fi
|
||||
# Gather all up for VIPS_CFLAGS, VIPS_INCLUDES, VIPS_LIBS
|
||||
# sort includes to get longer, more specific dirs first
|
||||
# helps, for example, selecting graphicsmagick over imagemagick
|
||||
VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $GSF_CFLAGS $FFTW_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $MATIO_CFLAGS $CFITSIO_CFLAGS $LIBWEBP_CFLAGS $GIFLIB_INCLUDES $RSVG_CFLAGS $POPPLER_CFLAGS $OPENEXR_CFLAGS $OPENSLIDE_CFLAGS $ORC_CFLAGS $TIFF_CFLAGS $LCMS_CFLAGS
|
||||
VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $ZLIB_CFLAGS $PANGOFT2_CFLAGS $GSF_CFLAGS $FFTW_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $MATIO_CFLAGS $CFITSIO_CFLAGS $LIBWEBP_CFLAGS $GIFLIB_INCLUDES $RSVG_CFLAGS $POPPLER_CFLAGS $OPENEXR_CFLAGS $OPENSLIDE_CFLAGS $ORC_CFLAGS $TIFF_CFLAGS $LCMS_CFLAGS
|
||||
do
|
||||
echo $i
|
||||
done | sort -ru`
|
||||
VIPS_CFLAGS=`echo $VIPS_CFLAGS`
|
||||
VIPS_CFLAGS="$VIPS_DEBUG_FLAGS $VIPS_CFLAGS"
|
||||
VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES"
|
||||
VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $GSF_LIBS $FFTW_LIBS $ORC_LIBS $LCMS_LIBS $GIFLIB_LIBS $RSVG_LIBS $POPPLER_LIBS $OPENEXR_LIBS $OPENSLIDE_LIBS $CFITSIO_LIBS $LIBWEBP_LIBS $MATIO_LIBS $EXIF_LIBS -lm"
|
||||
VIPS_INCLUDES="$ZLIB_INCLUDES $PNG_INCLUDES $TIFF_INCLUDES $JPEG_INCLUDES"
|
||||
VIPS_LIBS="$ZLIB_LIBS $MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $GSF_LIBS $FFTW_LIBS $ORC_LIBS $LCMS_LIBS $GIFLIB_LIBS $RSVG_LIBS $POPPLER_LIBS $OPENEXR_LIBS $OPENSLIDE_LIBS $CFITSIO_LIBS $LIBWEBP_LIBS $MATIO_LIBS $EXIF_LIBS -lm"
|
||||
|
||||
AC_SUBST(VIPS_LIBDIR)
|
||||
|
||||
@ -1057,6 +1071,7 @@ PDF import with poppler-glib: $with_poppler
|
||||
(requires poppler-glib 0.16.0 or later)
|
||||
SVG import with librsvg-2.0: $with_rsvg
|
||||
(requires librsvg-2.0 2.34.0 or later)
|
||||
zlib: $with_zlib
|
||||
file import with cfitsio: $with_cfitsio
|
||||
file import/export with libwebp: $with_libwebp
|
||||
(requires libwebp-0.1.3 or later)
|
||||
|
||||
@ -461,7 +461,7 @@ VImage::call_option_string( const char *operation_name,
|
||||
{
|
||||
VipsOperation *operation;
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_call_by_name: starting for %s ...\n",
|
||||
VIPS_DEBUG_MSG( "call_option_string: starting for %s ...\n",
|
||||
operation_name );
|
||||
|
||||
if( !(operation = vips_operation_new( operation_name )) ) {
|
||||
@ -489,6 +489,7 @@ VImage::call_option_string( const char *operation_name,
|
||||
*/
|
||||
if( vips_cache_operation_buildp( &operation ) ) {
|
||||
vips_object_unref_outputs( VIPS_OBJECT( operation ) );
|
||||
g_object_unref( operation );
|
||||
delete options;
|
||||
throw( VError() );
|
||||
}
|
||||
@ -570,7 +571,7 @@ VImage::new_from_image( std::vector<double> pixel )
|
||||
VImage onepx = VImage::black( 1, 1,
|
||||
VImage::option()->set( "bands", bands() ) );
|
||||
|
||||
onepx = onepx.linear( to_vectorv( 1, 1.0 ), pixel ).cast( format() );
|
||||
onepx = (onepx + pixel).cast( format() );
|
||||
|
||||
VImage big = onepx.embed( 0, 0, width(), height(),
|
||||
VImage::option()->set( "extend", VIPS_EXTEND_COPY ) );
|
||||
|
||||
@ -703,11 +703,8 @@ vips_tile_cache_gen( VipsRegion *or,
|
||||
"error on tile %p\n", tile );
|
||||
|
||||
vips_warn( class->nickname,
|
||||
_( "error reading tile %dx%d: "
|
||||
"%s" ),
|
||||
tile->pos.left, tile->pos.top,
|
||||
vips_error_buffer() );
|
||||
vips_error_clear();
|
||||
_( "error in tile %d x %d" ),
|
||||
tile->pos.left, tile->pos.top );
|
||||
|
||||
vips_region_black( tile->region );
|
||||
|
||||
|
||||
@ -341,11 +341,11 @@ vips_text_init( VipsText *text )
|
||||
*
|
||||
* Optional arguments:
|
||||
*
|
||||
* * @font: font to render with
|
||||
* * @width: render within this many pixels across
|
||||
* * @alignment: left/centre/right alignment
|
||||
* * @dpi: render at this resolution
|
||||
* * @spacing: space lines by this in points
|
||||
* * @font: %gchararray, font to render with
|
||||
* * @width: %gint, render within this many pixels across
|
||||
* * @align: #VipsAlign, left/centre/right alignment
|
||||
* * @dpi: %gint, render at this resolution
|
||||
* * @spacing: %gint, space lines by this in points
|
||||
*
|
||||
* Draw the string @text to an image. @out is a one-band 8-bit
|
||||
* unsigned char image, with 0 for no text and 255 for text. Values inbetween
|
||||
@ -359,7 +359,7 @@ vips_text_init( VipsText *text )
|
||||
*
|
||||
* @width is the maximum number of pixels across to draw within. If the
|
||||
* generated text is wider than this, it will wrap to a new line. In this
|
||||
* case, @alignment can be used to set the alignment style for multi-line
|
||||
* case, @align can be used to set the alignment style for multi-line
|
||||
* text.
|
||||
*
|
||||
* @dpi sets the resolution to render at. "sans 12" at 72 dpi draws characters
|
||||
|
||||
@ -977,27 +977,29 @@ read_jpeg_generate( VipsRegion *or,
|
||||
* a vips_sequential().
|
||||
*/
|
||||
if( r->top != jpeg->y_pos ) {
|
||||
VIPS_GATE_STOP( "read_jpeg_generate: work" );
|
||||
vips_error( "VipsJpeg",
|
||||
_( "out of order read at line %d" ), jpeg->y_pos );
|
||||
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
/* Here for longjmp() from vips__new_error_exit().
|
||||
*/
|
||||
if( setjmp( jpeg->eman.jmp ) )
|
||||
if( setjmp( jpeg->eman.jmp ) ) {
|
||||
VIPS_GATE_STOP( "read_jpeg_generate: work" );
|
||||
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
/* If --fail is set, we make read fail on any warnings. This will stop
|
||||
* on any errors from the previous jpeg_read_scanlines().
|
||||
*/
|
||||
if( jpeg->eman.pub.num_warnings > 0 &&
|
||||
jpeg->fail ) {
|
||||
vips_error( "VipsJpeg",
|
||||
_( "read gave %ld warnings" ),
|
||||
jpeg->eman.pub.num_warnings );
|
||||
vips_error( NULL, "%s", vips_error_buffer() );
|
||||
VIPS_GATE_STOP( "read_jpeg_generate: work" );
|
||||
|
||||
/* Make the message only appear once.
|
||||
/* Only fail once.
|
||||
*/
|
||||
jpeg->eman.pub.num_warnings = 0;
|
||||
|
||||
|
||||
@ -164,8 +164,9 @@ vips_foreign_save_png_file_build( VipsObject *object )
|
||||
build( object ) )
|
||||
return( -1 );
|
||||
|
||||
if( vips__png_write( save->ready, png_file->filename,
|
||||
png->compression, png->interlace, png->profile, png->filter ) )
|
||||
if( vips__png_write( save->ready,
|
||||
png_file->filename, png->compression, png->interlace,
|
||||
png->profile, png->filter, save->strip ) )
|
||||
return( -1 );
|
||||
|
||||
return( 0 );
|
||||
@ -223,7 +224,8 @@ vips_foreign_save_png_buffer_build( VipsObject *object )
|
||||
return( -1 );
|
||||
|
||||
if( vips__png_write_buf( save->ready, &obuf, &olen,
|
||||
png->compression, png->interlace, png->profile, png->filter ) )
|
||||
png->compression, png->interlace, png->profile, png->filter,
|
||||
save->strip ) )
|
||||
return( -1 );
|
||||
|
||||
/* vips__png_write_buf() makes a buffer that needs g_free(), not
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
*
|
||||
* 7/2/16
|
||||
* - from svgload.c
|
||||
* 1/8/16 felixbuenemann
|
||||
* - add svgz support
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -55,6 +57,23 @@
|
||||
#include <cairo.h>
|
||||
#include <librsvg/rsvg.h>
|
||||
|
||||
/* Old librsvg versions don't include librsvg-features.h by default.
|
||||
* Newer versions deprecate direct inclusion.
|
||||
*/
|
||||
#ifndef LIBRSVG_FEATURES_H
|
||||
#include <librsvg/librsvg-features.h>
|
||||
#endif
|
||||
|
||||
/* A handy #define for we-will-handle-svgz.
|
||||
*/
|
||||
#if LIBRSVG_CHECK_FEATURE(SVGZ) && defined(HAVE_ZLIB)
|
||||
#define HANDLE_SVGZ
|
||||
#endif
|
||||
|
||||
#ifdef HANDLE_SVGZ
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
typedef struct _VipsForeignLoadSvg {
|
||||
VipsForeignLoad parent_object;
|
||||
|
||||
@ -315,6 +334,12 @@ vips_foreign_load_svg_file_header( VipsForeignLoad *load )
|
||||
|
||||
static const char *vips_foreign_svg_suffs[] = {
|
||||
".svg",
|
||||
/* librsvg supports svgz directly, no need to check for zlib here.
|
||||
*/
|
||||
#if LIBRSVG_CHECK_FEATURE(SVGZ)
|
||||
".svgz",
|
||||
".svg.gz",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -364,13 +389,78 @@ typedef VipsForeignLoadSvgClass VipsForeignLoadSvgBufferClass;
|
||||
G_DEFINE_TYPE( VipsForeignLoadSvgBuffer, vips_foreign_load_svg_buffer,
|
||||
vips_foreign_load_svg_get_type() );
|
||||
|
||||
#ifdef HANDLE_SVGZ
|
||||
static void *
|
||||
vips_foreign_load_svg_zalloc( void *opaque, unsigned items, unsigned size )
|
||||
{
|
||||
return( g_malloc0_n( items, size ) );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_foreign_load_svg_zfree( void *opaque, void *ptr )
|
||||
{
|
||||
return( g_free( ptr ) );
|
||||
}
|
||||
#endif /*HANDLE_SVGZ*/
|
||||
|
||||
static gboolean
|
||||
vips_foreign_load_svg_is_a_buffer( const void *buf, size_t len )
|
||||
{
|
||||
char *str = (char *) buf;
|
||||
char *str;
|
||||
|
||||
#ifdef HANDLE_SVGZ
|
||||
/* If the buffer looks like a zip, deflate to here and then search
|
||||
* that for <svg.
|
||||
*/
|
||||
char obuf[224];
|
||||
#endif /*HANDLE_SVGZ*/
|
||||
|
||||
int i;
|
||||
|
||||
/* Start with str pointing at the argument buffer, swap to it pointing
|
||||
* into obuf if we see zip data.
|
||||
*/
|
||||
str = (char *) buf;
|
||||
|
||||
#ifdef HANDLE_SVGZ
|
||||
/* Check for SVGZ gzip signature and inflate.
|
||||
*
|
||||
* Minimum gzip size is 18 bytes, starting with 1F 8B.
|
||||
*/
|
||||
if( len >= 18 &&
|
||||
str[0] == '\037' &&
|
||||
str[1] == '\213' ) {
|
||||
z_stream zs;
|
||||
size_t opos;
|
||||
|
||||
zs.zalloc = (alloc_func) vips_foreign_load_svg_zalloc;
|
||||
zs.zfree = (free_func) vips_foreign_load_svg_zfree;
|
||||
zs.opaque = Z_NULL;
|
||||
zs.next_in = (unsigned char *) str;
|
||||
zs.avail_in = len;
|
||||
|
||||
/* There isn't really an error return from is_a_buffer()
|
||||
*/
|
||||
if( inflateInit2( &zs, 15 | 32 ) != Z_OK )
|
||||
return( FALSE );
|
||||
|
||||
opos = 0;
|
||||
do {
|
||||
zs.avail_out = sizeof( obuf ) - opos;
|
||||
zs.next_out = (unsigned char *) obuf + opos;
|
||||
if( inflate( &zs, Z_NO_FLUSH ) < Z_OK )
|
||||
return( FALSE );
|
||||
opos = sizeof( obuf ) - zs.avail_out;
|
||||
} while( opos < sizeof( obuf ) &&
|
||||
zs.avail_in > 0 );
|
||||
|
||||
inflateEnd( &zs );
|
||||
|
||||
str = obuf;
|
||||
len = opos;
|
||||
}
|
||||
#endif /*HANDLE_SVGZ*/
|
||||
|
||||
/* SVG documents are very freeform. They normally look like:
|
||||
*
|
||||
* <?xml version="1.0" encoding="UTF-8"?>
|
||||
@ -390,19 +480,13 @@ vips_foreign_load_svg_is_a_buffer( const void *buf, size_t len )
|
||||
return( 0 );
|
||||
for( i = 0; i < 24; i++ )
|
||||
if( !isascii( str[i] ) )
|
||||
return( 0 );
|
||||
return( FALSE );
|
||||
|
||||
for( i = 0; i < 200 && i < len - 5; i++ ) {
|
||||
char txt[5];
|
||||
for( i = 0; i < 200 && i < len - 5; i++ )
|
||||
if( g_ascii_strncasecmp( str + i, "<svg", 4 ) == 0 )
|
||||
return( TRUE );
|
||||
|
||||
/* 5, since we include the \0 at the end.
|
||||
*/
|
||||
vips_strncpy( txt, buf + i, 5 );
|
||||
if( strcasecmp( txt, "<svg" ) == 0 )
|
||||
return( 1 );
|
||||
}
|
||||
|
||||
return( 0 );
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@ -55,6 +55,9 @@
|
||||
* 26/2/15
|
||||
* - close the read down early for a header read ... this saves an
|
||||
* fd during file read, handy for large numbers of input images
|
||||
* 31/7/16
|
||||
* - support --strip option
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -808,8 +811,9 @@ write_png_block( VipsRegion *region, VipsRect *area, void *a )
|
||||
/* Write a VIPS image to PNG.
|
||||
*/
|
||||
static int
|
||||
write_vips( Write *write, int compress, int interlace, const char *profile,
|
||||
VipsForeignPngFilter filter )
|
||||
write_vips( Write *write,
|
||||
int compress, int interlace, const char *profile,
|
||||
VipsForeignPngFilter filter, gboolean strip )
|
||||
{
|
||||
VipsImage *in = write->in;
|
||||
|
||||
@ -883,7 +887,8 @@ write_vips( Write *write, int compress, int interlace, const char *profile,
|
||||
|
||||
/* Set ICC Profile.
|
||||
*/
|
||||
if( profile ) {
|
||||
if( profile &&
|
||||
!strip ) {
|
||||
if( strcmp( profile, "none" ) != 0 ) {
|
||||
void *data;
|
||||
size_t length;
|
||||
@ -902,7 +907,8 @@ write_vips( Write *write, int compress, int interlace, const char *profile,
|
||||
PNG_COMPRESSION_TYPE_BASE, data, length );
|
||||
}
|
||||
}
|
||||
else if( vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ) {
|
||||
else if( vips_image_get_typeof( in, VIPS_META_ICC_NAME ) &&
|
||||
!strip ) {
|
||||
void *data;
|
||||
size_t length;
|
||||
|
||||
@ -951,7 +957,7 @@ write_vips( Write *write, int compress, int interlace, const char *profile,
|
||||
int
|
||||
vips__png_write( VipsImage *in, const char *filename,
|
||||
int compress, int interlace, const char *profile,
|
||||
VipsForeignPngFilter filter )
|
||||
VipsForeignPngFilter filter, gboolean strip )
|
||||
{
|
||||
Write *write;
|
||||
|
||||
@ -970,7 +976,8 @@ vips__png_write( VipsImage *in, const char *filename,
|
||||
|
||||
/* Convert it!
|
||||
*/
|
||||
if( write_vips( write, compress, interlace, profile, filter ) ) {
|
||||
if( write_vips( write,
|
||||
compress, interlace, profile, filter, strip ) ) {
|
||||
vips_error( "vips2png",
|
||||
_( "unable to write \"%s\"" ), filename );
|
||||
|
||||
@ -1026,7 +1033,7 @@ user_write_data( png_structp png_ptr, png_bytep data, png_size_t length )
|
||||
int
|
||||
vips__png_write_buf( VipsImage *in,
|
||||
void **obuf, size_t *olen, int compression, int interlace,
|
||||
const char *profile, VipsForeignPngFilter filter )
|
||||
const char *profile, VipsForeignPngFilter filter, gboolean strip )
|
||||
{
|
||||
Write *write;
|
||||
|
||||
@ -1037,7 +1044,8 @@ vips__png_write_buf( VipsImage *in,
|
||||
|
||||
/* Convert it!
|
||||
*/
|
||||
if( write_vips( write, compression, interlace, profile, filter ) ) {
|
||||
if( write_vips( write,
|
||||
compression, interlace, profile, filter, strip ) ) {
|
||||
vips_error( "vips2png",
|
||||
"%s", _( "unable to write to buffer" ) );
|
||||
|
||||
|
||||
@ -48,10 +48,10 @@ int vips__png_header_buffer( const void *buffer, size_t length,
|
||||
|
||||
int vips__png_write( VipsImage *in, const char *filename,
|
||||
int compress, int interlace, const char *profile,
|
||||
VipsForeignPngFilter filter );
|
||||
VipsForeignPngFilter filter, gboolean strip );
|
||||
int vips__png_write_buf( VipsImage *in,
|
||||
void **obuf, size_t *olen, int compression, int interlace,
|
||||
const char *profile, VipsForeignPngFilter filter );
|
||||
const char *profile, VipsForeignPngFilter filter, gboolean strip );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -134,6 +134,7 @@ extern "C" {
|
||||
#define VIPS_META_ORIENTATION "orientation"
|
||||
|
||||
guint64 vips_format_sizeof( VipsBandFormat format );
|
||||
guint64 vips_format_sizeof_unsafe( VipsBandFormat format );
|
||||
|
||||
int vips_image_get_width( const VipsImage *image );
|
||||
int vips_image_get_height( const VipsImage *image );
|
||||
|
||||
@ -363,10 +363,11 @@ GType vips_image_get_type(void);
|
||||
/* Has to be guint64 and not size_t/off_t since we have to be able to address
|
||||
* huge images on platforms with 32-bit files.
|
||||
*/
|
||||
|
||||
/* Pixel address calculation macros.
|
||||
*/
|
||||
#define VIPS_IMAGE_SIZEOF_ELEMENT( I ) \
|
||||
(vips_format_sizeof((I)->BandFmt))
|
||||
(vips_format_sizeof_unsafe((I)->BandFmt))
|
||||
#define VIPS_IMAGE_SIZEOF_PEL( I ) \
|
||||
(VIPS_IMAGE_SIZEOF_ELEMENT( I ) * (I)->Bands)
|
||||
#define VIPS_IMAGE_SIZEOF_LINE( I ) \
|
||||
|
||||
@ -207,6 +207,7 @@ void *vips_hash_table_map( GHashTable *hash,
|
||||
char *vips_strncpy( char *dest, const char *src, int n );
|
||||
char *vips_strrstr( const char *haystack, const char *needle );
|
||||
gboolean vips_ispostfix( const char *a, const char *b );
|
||||
gboolean vips_iscasepostfix( const char *a, const char *b );
|
||||
gboolean vips_isprefix( const char *a, const char *b );
|
||||
char *vips_break_token( char *str, const char *brk );
|
||||
|
||||
|
||||
@ -201,6 +201,23 @@ vips_format_sizeof( VipsBandFormat format )
|
||||
return( vips__image_sizeof_bandformat[format] );
|
||||
}
|
||||
|
||||
/**
|
||||
* vips_format_sizeof_unsafe: (skip)
|
||||
* @format: format type
|
||||
*
|
||||
* A fast but dangerous version of vips_format_sizeof(). You must have
|
||||
* previously range-checked @format or you'll crash.
|
||||
*
|
||||
* Returns: number of bytes for a band format.
|
||||
*/
|
||||
guint64
|
||||
vips_format_sizeof_unsafe( VipsBandFormat format )
|
||||
{
|
||||
g_assert( 0 <= format && format <= VIPS_FORMAT_DPCOMPLEX );
|
||||
|
||||
return( vips__image_sizeof_bandformat[format] );
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
/* Check that this meta is on the hash table.
|
||||
*/
|
||||
|
||||
@ -231,9 +231,12 @@ vips__region_start( VipsRegion *region )
|
||||
g_mutex_unlock( image->sslock );
|
||||
|
||||
if( !region->seq ) {
|
||||
vips_error( "vips__region_start",
|
||||
_( "start function failed for image %s" ),
|
||||
#ifdef DEBUG
|
||||
printf( "vips__region_start: "
|
||||
"start function failed for image %s",
|
||||
image->filename );
|
||||
#endif /*DEBUG*/
|
||||
|
||||
return( -1 );
|
||||
}
|
||||
}
|
||||
@ -890,7 +893,7 @@ vips_region_fill( VipsRegion *reg, VipsRect *r, VipsRegionFillFn fn, void *a )
|
||||
* the pixels we need. If it does, we could copy them and only
|
||||
* generate the new ones.
|
||||
*
|
||||
* However, we usually have neighboring regions on different threads,
|
||||
* However, we usually have neighbouring regions on different threads,
|
||||
* so from the point of view of this thread, we will get no overlaps
|
||||
* on successive prepare requests.
|
||||
*/
|
||||
|
||||
@ -319,6 +319,20 @@ vips_ispostfix( const char *a, const char *b )
|
||||
return( strcmp( a + m - n, b ) == 0 );
|
||||
}
|
||||
|
||||
/* Case-insensitive test for string b ends string a. ASCII strings only.
|
||||
*/
|
||||
gboolean
|
||||
vips_iscasepostfix( const char *a, const char *b )
|
||||
{
|
||||
int m = strlen( a );
|
||||
int n = strlen( b );
|
||||
|
||||
if( n > m )
|
||||
return( FALSE );
|
||||
|
||||
return( strcasecmp( a + m - n, b ) == 0 );
|
||||
}
|
||||
|
||||
/* Test for string a starts string b. a is a known-good string, b may be
|
||||
* random data.
|
||||
*/
|
||||
@ -461,30 +475,22 @@ int
|
||||
vips_filename_suffix_match( const char *path, const char *suffixes[] )
|
||||
{
|
||||
char *basename;
|
||||
char *suffix;
|
||||
char *q;
|
||||
const char **p;
|
||||
int result;
|
||||
const char **p;
|
||||
|
||||
/* Drop any directory components, we want ignore any '.' in there.
|
||||
/* Drop any directory components.
|
||||
*/
|
||||
basename = g_path_get_basename( path );
|
||||
|
||||
/* Zap any trailing options.
|
||||
/* Zap any trailing [] options.
|
||||
*/
|
||||
if( (q = (char *) vips__find_rightmost_brackets( basename )) )
|
||||
*q = '\0';
|
||||
|
||||
/* And select just the '.' and to the right.
|
||||
*/
|
||||
if( (q = strrchr( basename, '.' )) )
|
||||
suffix = q;
|
||||
else
|
||||
suffix = basename;
|
||||
|
||||
result = 0;
|
||||
for( p = suffixes; *p; p++ )
|
||||
if( g_ascii_strcasecmp( suffix, *p ) == 0 ) {
|
||||
for( p = suffixes; *p; p++ )
|
||||
if( vips_iscasepostfix( basename, *p ) ) {
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Read and write a vips file
|
||||
/* Read and write a vips file.
|
||||
*
|
||||
* 22/5/08
|
||||
* - from im_open.c, im_openin.c, im_desc_hd.c, im_readhist.c,
|
||||
@ -330,6 +330,18 @@ vips__read_header_bytes( VipsImage *im, unsigned char *from )
|
||||
im->Xres = im->Xres_float;
|
||||
im->Yres = im->Yres_float;
|
||||
|
||||
/* Some protection against malicious files. We also check predicted
|
||||
* (based on these values) against real file length, see below.
|
||||
*/
|
||||
im->Xsize = VIPS_CLIP( 1, im->Xsize, VIPS_MAX_COORD );
|
||||
im->Ysize = VIPS_CLIP( 1, im->Ysize, VIPS_MAX_COORD );
|
||||
im->Bands = VIPS_CLIP( 1, im->Bands, VIPS_MAX_COORD );
|
||||
im->BandFmt = VIPS_CLIP( 0, im->BandFmt, VIPS_FORMAT_LAST - 1 );
|
||||
|
||||
/* Type, Coding, Offset, Res, etc. don't affect vips file layout, just
|
||||
* pixel interpretation, don't clip them.
|
||||
*/
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
|
||||
@ -321,15 +321,30 @@ vips_reduceh_gen( VipsRegion *out_region, void *seq,
|
||||
VIPS_GATE_START( "vips_reduceh_gen: work" );
|
||||
|
||||
for( int y = 0; y < r->height; y ++ ) {
|
||||
VipsPel *p0;
|
||||
VipsPel *q;
|
||||
|
||||
double X;
|
||||
|
||||
q = VIPS_REGION_ADDR( out_region, r->left, r->top + y );
|
||||
|
||||
X = r->left * reduceh->xshrink;
|
||||
|
||||
/* We want p0 to be the start (ie. x == 0) of the input
|
||||
* scanline we are reading from. We can then calculate the p we
|
||||
* need for each pixel with a single mul and avoid calling ADDR
|
||||
* for each pixel.
|
||||
*
|
||||
* We can't get p0 directly with ADDR since it could be outside
|
||||
* valid, so get the leftmost pixel in valid and subtract a
|
||||
* bit.
|
||||
*/
|
||||
p0 = VIPS_REGION_ADDR( ir, ir->valid.left, r->top + y ) -
|
||||
ir->valid.left * ps;
|
||||
|
||||
for( int x = 0; x < r->width; x++ ) {
|
||||
int ix = (int) X;
|
||||
VipsPel *p = VIPS_REGION_ADDR( ir, ix, r->top + y );
|
||||
VipsPel *p = p0 + ix * ps;
|
||||
const int sx = X * VIPS_TRANSFORM_SCALE * 2;
|
||||
const int six = sx & (VIPS_TRANSFORM_SCALE * 2 - 1);
|
||||
const int tx = (six + 1) >> 1;
|
||||
|
||||
117
m4/zip.m4
117
m4/zip.m4
@ -1,117 +0,0 @@
|
||||
dnl From FIND_MOTIF and ACX_PTHREAD, without much understanding
|
||||
dnl
|
||||
dnl FIND_ZIP[ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]
|
||||
dnl ------------------------------------------------
|
||||
dnl
|
||||
dnl Find ZIP libraries and headers
|
||||
dnl
|
||||
dnl Put includes stuff in ZIP_INCLUDES
|
||||
dnl Put link stuff in ZIP_LIBS
|
||||
dnl Define HAVE_ZIP if found
|
||||
dnl
|
||||
AC_DEFUN([FIND_ZIP], [
|
||||
AC_REQUIRE([AC_PATH_XTRA])
|
||||
|
||||
ZIP_INCLUDES=""
|
||||
ZIP_LIBS=""
|
||||
|
||||
AC_ARG_WITH(zip,
|
||||
AS_HELP_STRING([--without-zip], [build without libx (default: test)]))
|
||||
# Treat --without-zip like --without-zip-includes --without-zip-libraries.
|
||||
if test "$with_zip" = "no"; then
|
||||
ZIP_INCLUDES=no
|
||||
ZIP_LIBS=no
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(zip-includes,
|
||||
AS_HELP_STRING([--with-zip-includes=DIR], [libz includes are in DIR]),
|
||||
ZIP_INCLUDES="-I$withval")
|
||||
AC_ARG_WITH(zip-libraries,
|
||||
AS_HELP_STRING([--with-zip-libraries=DIR], [libz libraries are in DIR]),
|
||||
ZIP_LIBS="-L$withval -lz")
|
||||
|
||||
AC_MSG_CHECKING(for ZIP)
|
||||
|
||||
# Look for zlib.h
|
||||
if test "$ZIP_INCLUDES" = ""; then
|
||||
# Check the standard search path
|
||||
AC_TRY_COMPILE([#include <zlib.h>],[int a;],[
|
||||
ZIP_INCLUDES=""
|
||||
], [
|
||||
# zlib.h is not in the standard search path, try
|
||||
# $prefix
|
||||
zip_save_INCLUDES="$INCLUDES"
|
||||
|
||||
INCLUDES="-I${prefix}/include $INCLUDES"
|
||||
|
||||
AC_TRY_COMPILE([#include <zlib.h>],[int a;],[
|
||||
ZIP_INCLUDES="-I${prefix}/include"
|
||||
], [
|
||||
ZIP_INCLUDES="no"
|
||||
])
|
||||
|
||||
INCLUDES=$zip_save_INCLUDES
|
||||
])
|
||||
fi
|
||||
|
||||
# Now for the libraries
|
||||
if test "$ZIP_LIBS" = ""; then
|
||||
zip_save_LIBS="$LIBS"
|
||||
zip_save_INCLUDES="$INCLUDES"
|
||||
|
||||
LIBS="-lz $LIBS"
|
||||
INCLUDES="$ZIP_INCLUDES $INCLUDES"
|
||||
|
||||
# Try the standard search path first
|
||||
AC_TRY_LINK([#include <zlib.h>],[zlibVersion()], [
|
||||
ZIP_LIBS="-lz"
|
||||
], [
|
||||
# libz is not in the standard search path, try $prefix
|
||||
|
||||
LIBS="-L${prefix}/lib $LIBS"
|
||||
|
||||
AC_TRY_LINK([#include <zlib.h>],[zlibVersion()], [
|
||||
ZIP_LIBS="-L${prefix}/lib -lz"
|
||||
], [
|
||||
ZIP_LIBS=no
|
||||
])
|
||||
])
|
||||
|
||||
LIBS="$zip_save_LIBS"
|
||||
INCLUDES="$zip_save_INCLUDES"
|
||||
fi
|
||||
|
||||
AC_SUBST(ZIP_LIBS)
|
||||
AC_SUBST(ZIP_INCLUDES)
|
||||
|
||||
# Print a helpful message
|
||||
zip_libraries_result="$ZIP_LIBS"
|
||||
zip_includes_result="$ZIP_INCLUDES"
|
||||
|
||||
if test x"$zip_libraries_result" = x""; then
|
||||
zip_libraries_result="in default path"
|
||||
fi
|
||||
if test x"$zip_includes_result" = x""; then
|
||||
zip_includes_result="in default path"
|
||||
fi
|
||||
|
||||
if test "$zip_libraries_result" = "no"; then
|
||||
zip_libraries_result="(none)"
|
||||
fi
|
||||
if test "$zip_includes_result" = "no"; then
|
||||
zip_includes_result="(none)"
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([libraries $zip_libraries_result, headers $zip_includes_result])
|
||||
|
||||
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
|
||||
if test "$ZIP_INCLUDES" != "no" && test "$ZIP_LIBS" != "no"; then
|
||||
AC_DEFINE(HAVE_ZIP,1,[Define if you have libz libraries and header files.])
|
||||
$1
|
||||
else
|
||||
ZIP_LIBS=""
|
||||
ZIP_INCLUDES=""
|
||||
$2
|
||||
fi
|
||||
|
||||
])dnl
|
||||
124
m4/zlib.m4
Normal file
124
m4/zlib.m4
Normal file
@ -0,0 +1,124 @@
|
||||
dnl From FIND_MOTIF and ACX_PTHREAD, without much understanding
|
||||
dnl
|
||||
dnl FIND_ZLIB[ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]
|
||||
dnl ------------------------------------------------
|
||||
dnl
|
||||
dnl Find zlib libraries and headers ... useful for platforms which are missing
|
||||
dnl the zlib .pc file
|
||||
dnl
|
||||
dnl Put compile stuff in ZLIB_INCLUDES
|
||||
dnl Put link stuff in ZLIB_LIBS
|
||||
dnl Define HAVE_ZLIB if found
|
||||
dnl
|
||||
AC_DEFUN([FIND_ZLIB], [
|
||||
AC_REQUIRE([AC_PATH_XTRA])
|
||||
|
||||
ZLIB_INCLUDES=""
|
||||
ZLIB_LIBS=""
|
||||
|
||||
AC_ARG_WITH(zlib,
|
||||
AS_HELP_STRING([--without-zlib], [build without zlib (default: test)]))
|
||||
# Treat --without-zlib like --without-zlib-includes --without-zlib-libraries.
|
||||
if test "$with_zlib" = "no"; then
|
||||
ZLIB_INCLUDES=no
|
||||
ZLIB_LIBS=no
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(zlib-includes,
|
||||
AS_HELP_STRING([--with-zlib-includes=DIR], [libz includes are in DIR]),
|
||||
ZLIB_INCLUDES="-I$withval")
|
||||
AC_ARG_WITH(zlib-libraries,
|
||||
AS_HELP_STRING([--with-zlib-libraries=DIR], [libz libraries are in DIR]),
|
||||
ZLIB_LIBS="-L$withval -lz")
|
||||
|
||||
AC_MSG_CHECKING(for ZLIB)
|
||||
|
||||
# Look for zlib.h
|
||||
if test "$ZLIB_INCLUDES" = ""; then
|
||||
# Check the standard search path
|
||||
AC_TRY_COMPILE([#include <stdio.h>
|
||||
#include <zlib.h>],[int a;],[
|
||||
ZLIB_INCLUDES=""
|
||||
], [
|
||||
# zlib.h is not in the standard search path, try
|
||||
# $prefix
|
||||
zlib_save_INCLUDES="$INCLUDES"
|
||||
|
||||
INCLUDES="-I${prefix}/include $INCLUDES"
|
||||
|
||||
AC_TRY_COMPILE([#include <stdio.h>
|
||||
#include <zlib.h>],[int a;],[
|
||||
ZLIB_INCLUDES="-I${prefix}/include"
|
||||
], [
|
||||
ZLIB_INCLUDES="no"
|
||||
])
|
||||
|
||||
INCLUDES=$zlib_save_INCLUDES
|
||||
])
|
||||
fi
|
||||
|
||||
# Now for the libraries
|
||||
if test "$ZLIB_LIBS" = ""; then
|
||||
zlib_save_LIBS="$LIBS"
|
||||
zlib_save_INCLUDES="$INCLUDES"
|
||||
|
||||
LIBS="-lz $LIBS"
|
||||
INCLUDES="$ZLIB_INCLUDES $INCLUDES"
|
||||
|
||||
# Try the standard search path first
|
||||
AC_TRY_LINK([#include <stdio.h>
|
||||
#include <zlib.h>
|
||||
],[z_stream zs;inflateInit2(&zs, 15 | 32)], [
|
||||
ZLIB_LIBS="-lz"
|
||||
], [
|
||||
# libz is not in the standard search path, try $prefix
|
||||
|
||||
LIBS="-L${prefix}/lib $LIBS"
|
||||
|
||||
AC_TRY_LINK([#include <stdio.h>
|
||||
#include <zlib.h>
|
||||
],[z_stream zs;inflateInit2(&zs, 15 | 32)], [
|
||||
ZLIB_LIBS="-L${prefix}/lib -lz"
|
||||
], [
|
||||
ZLIB_LIBS=no
|
||||
])
|
||||
])
|
||||
|
||||
LIBS="$zlib_save_LIBS"
|
||||
INCLUDES="$zlib_save_INCLUDES"
|
||||
fi
|
||||
|
||||
AC_SUBST(ZLIB_LIBS)
|
||||
AC_SUBST(ZLIB_INCLUDES)
|
||||
|
||||
# Print a helpful message
|
||||
zlib_libraries_result="$ZLIB_LIBS"
|
||||
zlib_includes_result="$ZLIB_INCLUDES"
|
||||
|
||||
if test x"$zlib_libraries_result" = x""; then
|
||||
zlib_libraries_result="in default path"
|
||||
fi
|
||||
if test x"$zlib_includes_result" = x""; then
|
||||
zlib_includes_result="in default path"
|
||||
fi
|
||||
|
||||
if test "$zlib_libraries_result" = "no"; then
|
||||
zlib_libraries_result="(none)"
|
||||
fi
|
||||
if test "$zlib_includes_result" = "no"; then
|
||||
zlib_includes_result="(none)"
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([libraries $zlib_libraries_result, headers $zlib_includes_result])
|
||||
|
||||
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
|
||||
if test "$ZLIB_INCLUDES" != "no" && test "$ZLIB_LIBS" != "no"; then
|
||||
AC_DEFINE(HAVE_ZLIB,1,[Define if you have zlib libraries and header files.])
|
||||
$1
|
||||
else
|
||||
ZLIB_INCLUDES=""
|
||||
ZLIB_LIBS=""
|
||||
$2
|
||||
fi
|
||||
|
||||
])dnl
|
||||
@ -176,7 +176,7 @@ class Error(Exception):
|
||||
"""
|
||||
def __init__(self, message, detail = None):
|
||||
self.message = message
|
||||
if detail == None:
|
||||
if detail == None or detail == "":
|
||||
detail = Vips.error_buffer()
|
||||
Vips.error_clear()
|
||||
self.detail = detail
|
||||
|
||||
BIN
test/images/vips-profile.svg.gz
Normal file
BIN
test/images/vips-profile.svg.gz
Normal file
Binary file not shown.
BIN
test/images/vips-profile.svgz
Normal file
BIN
test/images/vips-profile.svgz
Normal file
Binary file not shown.
@ -50,6 +50,8 @@ class TestForeign(unittest.TestCase):
|
||||
self.pdf_file = "images/ISO_12233-reschart.pdf"
|
||||
self.cmyk_pdf_file = "images/cmyktest.pdf"
|
||||
self.svg_file = "images/vips-profile.svg"
|
||||
self.svgz_file = "images/vips-profile.svgz"
|
||||
self.svg_gz_file = "images/vips-profile.svg.gz"
|
||||
|
||||
self.colour = Vips.Image.jpegload(self.jpeg_file)
|
||||
self.mono = self.colour.extract_band(1)
|
||||
@ -492,6 +494,11 @@ class TestForeign(unittest.TestCase):
|
||||
self.file_loader("svgload", self.svg_file, svg_valid)
|
||||
self.buffer_loader("svgload_buffer", self.svg_file, svg_valid)
|
||||
|
||||
self.file_loader("svgload", self.svgz_file, svg_valid)
|
||||
self.buffer_loader("svgload_buffer", self.svgz_file, svg_valid)
|
||||
|
||||
self.file_loader("svgload", self.svg_gz_file, svg_valid)
|
||||
|
||||
im = Vips.Image.new_from_file(self.svg_file)
|
||||
x = Vips.Image.new_from_file(self.svg_file, scale = 2)
|
||||
self.assertLess(abs(im.width * 2 - x.width), 2)
|
||||
|
||||
@ -81,6 +81,8 @@
|
||||
* - restore BandFmt after unpremultiply
|
||||
* 23/5/16
|
||||
* - no need to guess max-alpha now premultiply does this for us
|
||||
* 1/8/16
|
||||
* - use scRGB as the working space in linear mode
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -357,7 +359,7 @@ thumbnail_shrink( VipsObject *process, VipsImage *in )
|
||||
{
|
||||
VipsImage **t = (VipsImage **) vips_object_local_array( process, 10 );
|
||||
VipsInterpretation interpretation = linear_processing ?
|
||||
VIPS_INTERPRETATION_XYZ : VIPS_INTERPRETATION_sRGB;
|
||||
VIPS_INTERPRETATION_scRGB : VIPS_INTERPRETATION_sRGB;
|
||||
|
||||
/* TRUE if we've done the import of an ICC transform and still need to
|
||||
* export.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user