svgload from a stream
This commit is contained in:
parent
41c08b0ffb
commit
441f61f3ff
|
@ -473,22 +473,12 @@ G_DEFINE_TYPE( VipsForeignLoadSvgStream, vips_foreign_load_svg_stream,
|
|||
gboolean
|
||||
vips_foreign_load_svg_stream_is_a( VipsStreami *input )
|
||||
{
|
||||
ssize_t n;
|
||||
unsigned char *data;
|
||||
|
||||
if( vips_streami_rewind( input ) )
|
||||
if( !(data = vips_streami_sniff( input, SVG_HEADER_SIZE )) )
|
||||
return( FALSE );
|
||||
|
||||
g_byte_array_set_size( input->sniff, SVG_HEADER_SIZE );
|
||||
|
||||
/* Can't use vips_streami_sniff here.
|
||||
*/
|
||||
if( (n = vips_streami_read( input, input->sniff->data,
|
||||
SVG_HEADER_SIZE )) == -1 || n == 0 )
|
||||
return( FALSE );
|
||||
|
||||
g_byte_array_set_size( input->sniff, n );
|
||||
|
||||
return( vips_foreign_load_svg_is_a( input->sniff->data, n ) );
|
||||
return( vips_foreign_load_svg_is_a( data, SVG_HEADER_SIZE ) );
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -33,9 +33,6 @@
|
|||
#ifndef VIPS_STREAM_H
|
||||
#define VIPS_STREAM_H
|
||||
|
||||
// TODO: #ifdef HAVE_RSVG (?)
|
||||
#include <gio/gio.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /*__cplusplus*/
|
||||
|
@ -297,7 +294,6 @@ int vips_streamib_require( VipsStreamib *streamib, int require );
|
|||
const unsigned char *vips_streamib_get_line( VipsStreamib *streamib );
|
||||
unsigned char *vips_streamib_get_line_copy( VipsStreamib *streamib );
|
||||
|
||||
// TODO: #ifdef HAVE_RSVG (?)
|
||||
#define VIPS_TYPE_STREAMIW (vips_streamiw_get_type())
|
||||
#define VIPS_STREAMIW( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
|
||||
|
|
|
@ -88,6 +88,7 @@ extern "C" {
|
|||
#include <glib/gstdio.h>
|
||||
#include <gmodule.h>
|
||||
#include <glib-object.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
/* If we're being parsed by SWIG, remove gcc attributes.
|
||||
*/
|
||||
|
|
|
@ -32,7 +32,8 @@
|
|||
|
||||
/* TODO
|
||||
*
|
||||
* - Should we conditionally exclude this class? It's only needed for librsvg.
|
||||
* - should we conditionally exclude this class? It's only needed for librsvg.
|
||||
* - it pulls in gio.h -- does this change our minimum version for glib?
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -66,8 +67,7 @@ G_DEFINE_TYPE_WITH_CODE( VipsStreamiw, vips_streamiw, G_TYPE_INPUT_STREAM,
|
|||
G_IMPLEMENT_INTERFACE( G_TYPE_SEEKABLE,
|
||||
vips_streamiw_seekable_iface_init ) )
|
||||
|
||||
enum
|
||||
{
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_STREAM
|
||||
};
|
||||
|
@ -115,15 +115,13 @@ vips_streamiw_finalize( GObject *object )
|
|||
static goffset
|
||||
vips_streamiw_tell( GSeekable *seekable )
|
||||
{
|
||||
VipsStreami *streami;
|
||||
goffset pos;
|
||||
VipsStreami *streami = VIPS_STREAMIW( seekable )->streami;
|
||||
|
||||
streami = VIPS_STREAMIW( seekable )->streami;
|
||||
goffset pos;
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_streamiw_tell:\n" );
|
||||
|
||||
pos = vips_streami_seek( streami, 0, SEEK_CUR );
|
||||
|
||||
if( pos == -1 )
|
||||
return( 0 );
|
||||
|
||||
|
@ -164,8 +162,7 @@ vips_streamiw_seek( GSeekable *seekable, goffset offset,
|
|||
", type = %d\n", offset, type );
|
||||
|
||||
if( vips_streami_seek( streami, offset,
|
||||
seek_type_to_lseek( type ) ) == -1 )
|
||||
{
|
||||
seek_type_to_lseek( type ) ) == -1 ) {
|
||||
g_set_error( error, G_IO_ERROR,
|
||||
G_IO_ERROR_FAILED,
|
||||
_( "Error while seeking: %s" ),
|
||||
|
@ -234,8 +231,7 @@ vips_streamiw_skip( GInputStream *stream, gsize count,
|
|||
return( -1 );
|
||||
|
||||
start = vips_streami_seek( streami, 0, SEEK_CUR );
|
||||
if( start == -1 )
|
||||
{
|
||||
if( start == -1 ) {
|
||||
g_set_error( error, G_IO_ERROR,
|
||||
G_IO_ERROR_FAILED,
|
||||
_( "Error while seeking: %s" ),
|
||||
|
@ -244,8 +240,7 @@ vips_streamiw_skip( GInputStream *stream, gsize count,
|
|||
}
|
||||
|
||||
end = vips_streami_seek( streami, 0, SEEK_END );
|
||||
if( end == -1 )
|
||||
{
|
||||
if( end == -1 ) {
|
||||
g_set_error( error, G_IO_ERROR,
|
||||
G_IO_ERROR_FAILED,
|
||||
_( "Error while seeking: %s" ),
|
||||
|
@ -253,12 +248,10 @@ vips_streamiw_skip( GInputStream *stream, gsize count,
|
|||
return( -1 );
|
||||
}
|
||||
|
||||
if( end - start > count )
|
||||
{
|
||||
if( end - start > count ) {
|
||||
end = vips_streami_seek( streami, count - (end - start),
|
||||
SEEK_CUR );
|
||||
if( end == -1 )
|
||||
{
|
||||
if( end == -1 ) {
|
||||
g_set_error( error, G_IO_ERROR,
|
||||
G_IO_ERROR_FAILED,
|
||||
_( "Error while seeking: %s" ),
|
||||
|
|
Loading…
Reference in New Issue