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

more buffered input tweaking

Browse Source
This commit is contained in:
John Cupitt 2019-11-01 12:57:48 +00:00
parent ca5d75f7ec
commit 805da46670
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvips/include/vips/stream.h
View File

@ -242,6 +242,8 @@ gint64 vips_streami_size( VipsStreami *streami );
typedef struct _VipsStreamib { typedef struct _VipsStreamib {
VipsStreami parent_object; VipsStreami parent_object;
/*< private >*/
/* The +1 means there's always a \0 byte at the end. /* The +1 means there's always a \0 byte at the end.
*/ */
char input_buffer[VIPS_STREAMIB_BUFFER_SIZE + 1]; char input_buffer[VIPS_STREAMIB_BUFFER_SIZE + 1];
@ -249,6 +251,10 @@ typedef struct _VipsStreamib {
char *read_point; char *read_point;
int bytes_remaining; int bytes_remaining;
/* No seeks on buffered streams, so an EOF flag is easy.
*/
gboolean eof;
} VipsStreamib; } VipsStreamib;
typedef struct _VipsStreamibClass { typedef struct _VipsStreamibClass {

8
libvips/iofuncs/streami.c
View File

@ -1114,7 +1114,8 @@ vips_streamib_refill( VipsStreamib *streamib )
*/ */
streamib->read_postion[bytes_read] = '\0'; streamib->read_postion[bytes_read] = '\0';
how do we siganl EOF? if( bytes_read == 0 )
streamib->eof = TRUE;
return( 0 ); return( 0 );
} }
@ -1192,8 +1193,13 @@ vips_streamib_get_line( VipsStreamib *streamib, const char **line )
*/ */
if( vips_streamib_refill( streamib ) ) if( vips_streamib_refill( streamib ) )
return( -1 ); return( -1 );
if( streamib->eof )
break;
} }
} }
return( 0 );
} }
/** /**