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

Merge branch '8.10'

This commit is contained in:
John Cupitt 2021-05-05 17:32:25 +01:00
parent 0e861d7325 e19acd5148
commit a2e5717e82
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -32,6 +32,7 @@
30/4/21 start 8.10.7
- better vips7 PNG load compatibility [SkyDiverCool]
- fix load of large PPM images from a pipe [ewelot]
22/12/20 start 8.10.6
- don't seek on bad file descriptors [kleisauke]

6
libvips/foreign/ppmload.c
View File

@ -510,8 +510,8 @@ vips_foreign_load_ppm_generate_binary( VipsRegion *or,
while( n_bytes > 0 ) {
gint64 bytes_read;
bytes_read = vips_source_read( ppm->source,
q, sizeof_line );
bytes_read =
vips_source_read( ppm->source, q, n_bytes );
if( bytes_read < 0 )
return( -1 );
if( bytes_read == 0 ) {
@ -520,8 +520,8 @@ vips_foreign_load_ppm_generate_binary( VipsRegion *or,
return( -1 );
}
n_bytes -= bytes_read;
q += bytes_read;
n_bytes -= bytes_read;
}
}