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

fix ssize_t / ssize_t confusion

Browse Source
This commit is contained in:
John Cupitt 2022-05-11 22:28:34 +01:00
parent f0eb493643
commit e2c50d07c6
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvips/foreign/jpeg2vips.c
View File

@ -243,12 +243,12 @@ source_fill_input_buffer( j_decompress_ptr cinfo )
Source *src = (Source *) cinfo->src; Source *src = (Source *) cinfo->src;
size_t read; gint64 bytes_read;
if( (read = vips_source_read( src->source, if( (bytes_read = vips_source_read( src->source,
src->buf, SOURCE_BUFFER_SIZE )) > 0 ) { src->buf, SOURCE_BUFFER_SIZE )) > 0 ) {
src->pub.next_input_byte = src->buf; src->pub.next_input_byte = src->buf;
src->pub.bytes_in_buffer = read; src->pub.bytes_in_buffer = bytes_read;
} }
else { else {
if( src->jpeg->fail_on >= VIPS_FAIL_ON_TRUNCATED ) if( src->jpeg->fail_on >= VIPS_FAIL_ON_TRUNCATED )

9
libvips/foreign/pdfiumload.c
View File

@ -236,12 +236,13 @@ vips_pdfium_GetBlock( void *param,
return( FALSE ); return( FALSE );
while( size > 0 ) { while( size > 0 ) {
size_t n_read; gint64 bytes_read;
if( (n_read = vips_source_read( pdf->source, pBuf, size )) < 0 ) if( (bytes_read =
vips_source_read( pdf->source, pBuf, size )) < 0 )
return( FALSE ); return( FALSE );
pBuf += n_read; pBuf += bytes_read;
size -= n_read; size -= bytes_read;
} }
return( TRUE ); return( TRUE );

4
libvips/iofuncs/sbuf.c
View File

@ -270,10 +270,10 @@ vips_sbuf_require( VipsSbuf *sbuf, int require )
int space_available = int space_available =
VIPS_SBUF_BUFFER_SIZE - VIPS_SBUF_BUFFER_SIZE -
sbuf->chars_in_buffer; sbuf->chars_in_buffer;
size_t bytes_read; gint64 bytes_read;
if( (bytes_read = vips_source_read( sbuf->source, if( (bytes_read = vips_source_read( sbuf->source,
to, space_available )) == -1 ) to, space_available )) < 0 )
return( -1 ); return( -1 );
if( bytes_read == 0 ) { if( bytes_read == 0 ) {
vips_error( vips_error(