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

fix radload from pipe

Browse Source
This commit is contained in:
John Cupitt 2019-11-08 17:39:25 +00:00
parent 51ac7a6d8c
commit ce4729c92b
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvips/foreign/foreign.c
View File

@ -629,9 +629,15 @@ vips_foreign_find_load_stream_sub( void *item, void *a, void *b )
VipsForeignLoadClass *load_class = VIPS_FOREIGN_LOAD_CLASS( item );
VipsStreami *streami = VIPS_STREAMI( a );
if( load_class->is_a_stream &&
load_class->is_a_stream( streami ) )
return( load_class );
if( load_class->is_a_stream ) {
/* We may have done a read() rather than a sniff() in one of
* the is_a testers. Always rewind.
*/
(void) vips_streami_rewind( streami );
if( load_class->is_a_stream( streami ) )
return( load_class );
}
return( NULL );
}

6
libvips/foreign/radiance.c
View File

@ -757,6 +757,9 @@ read_new( VipsStreami *streami, VipsImage *out )
Read *read;
int i;
if( vips_streami_rewind( streami ) )
return( NULL );
if( !(read = VIPS_NEW( out, Read )) )
return( NULL );
@ -945,7 +948,8 @@ vips__rad_load( VipsStreami *streami, VipsImage *out )
Read *read;
#ifdef DEBUG
printf( "rad2vips: reading \"%s\"\n", filename );
printf( "rad2vips: reading \"%s\"\n",
vips_stream_nick( VIPS_STREAM( streami ) ) );
#endif /*DEBUG*/
if( !(read = read_new( streami, out )) )

19
libvips/iofuncs/streamib.c
View File

@ -32,8 +32,6 @@
/* TODO
*
* - make something to parse input and implement rad load
* - gaussblur is missing the vector path again argh
* - can we map and then close the fd? how about on Windows?
* - make a subclass that lets you set vfuncs as params, inc. close(),
* is_pipe etc.
@ -145,6 +143,8 @@ vips_streamib_refill( VipsStreamib *streamib )
{
ssize_t bytes_read;
VIPS_DEBUG_MSG( "vips_streamib_refill:\n" );
/* We should not discard any unread bytes.
*/
g_assert( streamib->read_point == streamib->chars_in_buffer );
@ -230,6 +230,8 @@ vips_streamib_require( VipsStreamib *streamib, int require )
g_assert( streamib->read_point >= 0 );
g_assert( streamib->read_point <= streamib->chars_in_buffer );
VIPS_DEBUG_MSG( "vips_streamib_require: %d\n", require );
if( streamib->read_point + require > streamib->chars_in_buffer ) {
/* Areas can overlap, so we must memmove().
*/
@ -323,6 +325,8 @@ vips_streamib_get_line( VipsStreamib *streamib )
int space_remaining;
int ch;
VIPS_DEBUG_MSG( "vips_streamib_get_line:\n" );
write_point = 0;
space_remaining = VIPS_STREAMIB_BUFFER_SIZE;
@ -361,6 +365,8 @@ vips_streamib_get_line( VipsStreamib *streamib )
;
}
VIPS_DEBUG_MSG( " %s\n", streamib->line );
return( streamib->line );
}
@ -384,8 +390,11 @@ vips_streamib_get_line_copy( VipsStreamib *streamib )
{
static const unsigned char null = '\0';
VIPS_DEBUG_MSG( "vips_streamib_get_line_copy:\n" );
GByteArray *buffer;
int ch;
unsigned char *result;
buffer = g_byte_array_new();
@ -414,5 +423,9 @@ vips_streamib_get_line_copy( VipsStreamib *streamib )
g_byte_array_append( buffer, &null, 1 );
return( (unsigned char *) g_byte_array_free( buffer, FALSE ) );
result = (unsigned char *) g_byte_array_free( buffer, FALSE );
VIPS_DEBUG_MSG( " %s\n", result );
return( result );
}