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

almost done 

a valgrind failure still
This commit is contained in:
John Cupitt 2016-02-12 10:53:04 +00:00
parent 1e6af6656f
commit 9262d672b7
5 changed files with 246 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,7 +2,7 @@
- add vips_reduce*() ... a fast path for bicubic downsize
- vips_resize() and vips_similarity() use it when they can
- bicubic is better on 32-bit int images
- add pdfload and svgload for PDF and SVG rendering
- add pdfload, svgload, gifload for PDF, SVG and GIF rendering
- vipsthumbnail knows about pdfload and svgload
27/1/16 started 8.2.3

14
TODO
View File

@ -1,4 +1,16 @@
- gif loader?
- gif loader
seeing a valgrind fail
valgrind vips copy 3198.gif[page=12] x.v
==3536== Invalid read of size 1
==3536== at 0x4FF144C: vips_foreign_load_gif_render_line (gifload.c:248)
there's also an 88-byte leak?
need tests, need to update APIs
- could load pdf thumbnails?

75
libvips/foreign/foreign.c
View File

@ -3050,3 +3050,78 @@ vips_svgload_buffer( void *buf, size_t len, VipsImage **out, ... )
return( result );
}
/**
* vips_gifload:
* @filename: file to load
* @out: output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
*
* @page: %ginit, page (frame) to read
*
* Read a GIF file into a VIPS image. Rendering uses the giflib library.
*
* Use @page to set page number (frame number) to read.
*
* The whole GIF is parsed and read into memory on header access, the whole
* GIF is rendered on first pixel access.
*
* See also: vips_image_new_from_file().
*
* Returns: 0 on success, -1 on error.
*/
int
vips_gifload( const char *filename, VipsImage **out, ... )
{
va_list ap;
int result;
va_start( ap, out );
result = vips_call_split( "gifload", ap, filename, out );
va_end( ap );
return( result );
}
/**
* vips_gifload_buffer:
* @buf: memory area to load
* @len: size of memory area
* @out: image to write
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
*
* @page: %ginit, page (frame) to read
*
* Read a GIF-formatted memory block into a VIPS image. Exactly as
* vips_gifload(), but read from a memory buffer.
*
* You must not free the buffer while @out is active. The
* #VipsObject::postclose signal on @out is a good place to free.
*
* See also: vips_gifload().
*
* Returns: 0 on success, -1 on error.
*/
int
vips_gifload_buffer( void *buf, size_t len, VipsImage **out, ... )
{
va_list ap;
VipsBlob *blob;
int result;
/* We don't take a copy of the data or free it.
*/
blob = vips_blob_new( NULL, buf, len );
va_start( ap, out );
result = vips_call_split( "gifload_buffer", ap, blob, out );
va_end( ap );
vips_area_unref( VIPS_AREA( blob ) );
return( result );
}

202
libvips/foreign/gifload.c
View File

@ -57,11 +57,11 @@
typedef struct _VipsForeignLoadGif {
VipsForeignLoad parent_object;
GifFileType *file;
/* The bitmap for the frame we fetch.
/* Load this page (frame number).
*/
unsigned char *RasterBits;
int page;
GifFileType *file;
} VipsForeignLoadGif;
@ -70,6 +70,12 @@ typedef VipsForeignLoadClass VipsForeignLoadGifClass;
G_DEFINE_ABSTRACT_TYPE( VipsForeignLoadGif, vips_foreign_load_gif,
VIPS_TYPE_FOREIGN_LOAD );
/* From gif2rgb.c ... offsets and jumps for interlaced GIF images.
*/
static int
InterlacedOffset[] = { 0, 4, 2, 1 },
InterlacedJumps[] = { 8, 8, 4, 2 };
/* From gif-lib.h
#define D_GIF_ERR_OPEN_FAILED 101
@ -86,6 +92,8 @@ G_DEFINE_ABSTRACT_TYPE( VipsForeignLoadGif, vips_foreign_load_gif,
#define D_GIF_ERR_IMAGE_DEFECT 112
#define D_GIF_ERR_EOF_TOO_SOON 113
giflib5 has a function to decode these, but we need to work with giflib4.
*/
static const char *
vips_foreign_load_gif_errstr( int error_code )
@ -200,13 +208,15 @@ vips_foreign_load_gif_parse( VipsForeignLoadGif *gif,
*/
vips_image_pipelinev( out, VIPS_DEMAND_STYLE_ANY, NULL );
vips_image_set_int( out, "gif-n_pages",
gif->file->ImageCount );
}
static int
vips_foreign_load_gif_header( VipsForeignLoad *load )
{
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( load );
VipsForeignLoadGif *gif = (VipsForeignLoadGif *) load;
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( gif );
if( DGifSlurp( gif->file ) != GIF_OK ) {
vips_error( class->nickname,
@ -215,59 +225,108 @@ vips_foreign_load_gif_header( VipsForeignLoad *load )
return( -1 );
}
if( gif->file->SavedImages &&
gif->file->SavedImages->RasterBits )
gif->RasterBits = gif->file->SavedImages->RasterBits;
if( gif->page < 0 ||
gif->page > gif->file->ImageCount ) {
vips_error( class->nickname,
_( "unable to load page %d" ), gif->page );
return( -1 );
}
vips_foreign_load_gif_parse( gif, load->out );
return( 0 );
}
static int
vips_foreign_load_gif_generate( VipsRegion *or,
void *seq, void *a, void *b, gboolean *stop )
static void
vips_foreign_load_gif_render_line( VipsForeignLoadGif *gif,
ColorMapObject *map, int width,
VipsPel * restrict q, VipsPel * restrict p )
{
VipsForeignLoadGif *gif = (VipsForeignLoadGif *) a;
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( gif );
VipsRect *r = &or->valid;
unsigned char *bits = gif->RasterBits;
ColorMapObject *map = gif->file->SColorMap;
int width = gif->file->Image.Width;
int x;
if( bits &&
map ) {
int count = map->ColorCount;
for( x = 0; x < width; x++ ) {
if( p[x] &&
p[x] < map->ColorCount ) {
q[0] = map->Colors[p[x]].Red;
q[1] = map->Colors[p[x]].Green;
q[2] = map->Colors[p[x]].Blue;
q[3] = 255;
}
else {
q[0] = 0;
q[1] = 0;
q[2] = 0;
q[3] = 0;
}
int x, y;
q += 4;
}
}
for( y = 0; y < r->height; y++ ) {
VipsPel * restrict p;
VipsPel * restrict q;
/* Render a SavedImage (a frame of a GIF) into an RGBA buffer. GIFs
* accumulate, so don't clear the buffer first, so that we can paint a
* series of frames on top of each other.
*
* We can't easily render just a part of the buffer since SavedImages can be
* interlaced, and they are annoying to paint in parts.
*/
static void
vips_foreign_load_gif_render_savedimage( VipsForeignLoadGif *gif,
VipsImage *out, SavedImage *image )
{
GifFileType *file = gif->file;
p = bits + r->left + (r->top + y) * width;
q = VIPS_REGION_ADDR( or, r->left, r->top + y );
for( x = 0; x < r->width; x++ ) {
if( p[x] < count &&
p[x] != gif->file->SBackGroundColor ) {
q[0] = map->Colors[p[x]].Red;
q[1] = map->Colors[p[x]].Green;
q[2] = map->Colors[p[x]].Blue;
q[3] = 255;
}
else {
q[0] = 0;
q[1] = 0;
q[2] = 0;
q[3] = 0;
}
/* Use the local colormap, if defined.
*/
ColorMapObject *map = image->ImageDesc.ColorMap ?
image->ImageDesc.ColorMap : file->SColorMap;
q += 4;
VipsRect image_rect, gif_rect, clip;
int y;
/* Clip this savedimage position against the image size. Not all
* giflibs check this for us.
*
* If ImageDesc has been set maliciously we can still read outside
* RasterBits, but at least we won't write outside out.
*/
image_rect.left = 0;
image_rect.top = 0;
image_rect.width = out->Xsize;
image_rect.height = out->Ysize;
gif_rect.left = image->ImageDesc.Left;
gif_rect.top = image->ImageDesc.Top;
gif_rect.width = image->ImageDesc.Width;
gif_rect.height = image->ImageDesc.Height;
vips_rect_intersectrect( &image_rect, &gif_rect, &clip );
if( image->ImageDesc.Interlace ) {
int i;
int input_y;
input_y = clip.top;
for( i = 0; i < 4; i++ ) {
for( y = InterlacedOffset[i];
y < clip.height;
y += InterlacedJumps[i] ) {
vips_foreign_load_gif_render_line( gif, map,
clip.width,
VIPS_IMAGE_ADDR( out, 0, y ),
image->RasterBits + clip.left +
input_y * image->ImageDesc.Width );
input_y += 1;
}
}
}
return( 0 );
else {
for( y = 0; y < clip.height; y++ ) {
vips_foreign_load_gif_render_line( gif, map,
clip.width,
VIPS_IMAGE_ADDR( out, 0, y ),
image->RasterBits + clip.left +
(clip.top + y) * image->ImageDesc.Width );
}
}
}
static int
@ -275,11 +334,20 @@ vips_foreign_load_gif_load( VipsForeignLoad *load )
{
VipsForeignLoadGif *gif = (VipsForeignLoadGif *) load;
int i;
vips_foreign_load_gif_parse( gif, load->real );
if( vips_image_generate( load->real,
NULL, vips_foreign_load_gif_generate, NULL, gif, NULL ) )
/* Turn out into a memory image which we then render the GIF frames
* into.
*/
if( vips_image_write_prepare( load->real ) )
return( -1 );
for( i = 0; i <= gif->page; i++ )
vips_foreign_load_gif_render_savedimage( gif,
load->real, &gif->file->SavedImages[i] );
return( 0 );
}
@ -302,6 +370,12 @@ vips_foreign_load_gif_class_init( VipsForeignLoadGifClass *class )
load_class->get_flags = vips_foreign_load_gif_get_flags;
load_class->load = vips_foreign_load_gif_load;
VIPS_ARG_INT( class, "page", 10,
_( "Page" ),
_( "Load this page from the file" ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignLoadGif, page ),
0, 100000, 0 );
}
@ -386,6 +460,11 @@ typedef struct _VipsForeignLoadGifBuffer {
*/
VipsArea *buf;
/* Current read point, bytes left in buffer.
*/
VipsPel *p;
size_t bytes_to_go;
} VipsForeignLoadGifBuffer;
typedef VipsForeignLoadGifClass VipsForeignLoadGifBufferClass;
@ -393,20 +472,43 @@ typedef VipsForeignLoadGifClass VipsForeignLoadGifBufferClass;
G_DEFINE_TYPE( VipsForeignLoadGifBuffer, vips_foreign_load_gif_buffer,
vips_foreign_load_gif_get_type() );
/* Callback from the gif loader.
*
* Read up to len bytes into buffer, return number of bytes read, 0 for EOF.
*/
static int
vips_foreign_load_gif_buffer_read( GifFileType *file,
GifByteType *buf, int len )
{
VipsForeignLoadGifBuffer *buffer = (VipsForeignLoadGifBuffer *)
file->UserData;
size_t will_read = VIPS_MIN( len, buffer->bytes_to_go );
memcpy( buf, buffer->p, will_read );
buffer->bytes_to_go -= will_read;
return( will_read );
}
static int
vips_foreign_load_gif_buffer_header( VipsForeignLoad *load )
{
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( load );
VipsForeignLoadGif *gif = (VipsForeignLoadGif *) load;
VipsForeignLoadGifBuffer *buffer =
(VipsForeignLoadGifBuffer *) load;
/*
if( !(gif->page = rgif_handle_new_from_data(
buffer->buf->data, buffer->buf->length, &error )) ) {
vips_g_error( &error );
/* Init the read point.
*/
buffer->p = buffer->buf->data;
buffer->bytes_to_go = buffer->buf->length;
if( !(gif->file = DGifOpen( gif,
vips_foreign_load_gif_buffer_read )) ) {
vips_error( class->nickname,
"%s", _( "unable to open GIF file" ) );
return( -1 );
}
*/
return( vips_foreign_load_gif_header( load ) );
}

5
libvips/include/vips/foreign.h
View File

@ -500,6 +500,11 @@ int vips_svgload( const char *filename, VipsImage **out, ... )
int vips_svgload_buffer( void *buf, size_t len, VipsImage **out, ... )
__attribute__((sentinel));
int vips_gifload( const char *filename, VipsImage **out, ... )
__attribute__((sentinel));
int vips_gifload_buffer( void *buf, size_t len, VipsImage **out, ... )
__attribute__((sentinel));
/**
* VipsForeignDzLayout:
* @VIPS_FOREIGN_DZ_LAYOUT_DZ: use DeepZoom directory layout