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

Merge branch '8.10'

Browse Source
This commit is contained in:
John Cupitt 2021-03-07 12:26:24 +00:00
commit fc4ad15f97
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -24,14 +24,14 @@
22/12/20 start 8.10.6 22/12/20 start 8.10.6
- don't seek on bad file descriptors [kleisauke] - don't seek on bad file descriptors [kleisauke]
- check for null memory sources [kleisauke] - check for null memory sources [kleisauke]
- revise ppmload, fixing a couple of small bugs - improve ppmload, fixing a couple of small bugs
- signal error on EOF in jpegload more reliably [bozaro] - improve EOF detection in jpegload [bozaro]
- better error detection in spngload [randy408] - improve error detection in spngload [randy408]
- fix includes of glib headers in C++ [lovell] - fix includes of glib headers in C++ [lovell]
- fix build with more modern librsvg [lovell] - fix build with more modern librsvg [lovell]
- fix a possible segv with very wide images [f1ac] - fix a possible segv with very wide images [f1ac]
- revise premultiply, again [jjonesrs] - fix issue thumbnailing RGBA images in linear mode [jjonesrs]
- revise profile handling in vipsthumbnail - improve vipsthumbnail profile handling
- fix tiff deflate predictor setting [Adios] - fix tiff deflate predictor setting [Adios]
18/12/20 started 8.10.5 18/12/20 started 8.10.5

2
doc/Makefile.am
View File

@ -127,7 +127,7 @@ HTML_IMAGES = \
# we have some files in markdown ... convert to docbook for gtk-doc # we have some files in markdown ... convert to docbook for gtk-doc
# pandoc makes section headers, we want refsect3 for gtk-doc # pandoc makes section headers, we want refsect3 for gtk-doc
.md.xml: .md.xml:
pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook-smart -o $@ $< pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook -o $@ $<
sed -e s/section/refsect3/g < $@ > x && mv x $@ sed -e s/section/refsect3/g < $@ > x && mv x $@
# Our markdown source files # Our markdown source files

4
libvips/resample/thumbnail.c
View File

@ -877,13 +877,13 @@ vips_thumbnail_build( VipsObject *object )
thumbnail->export_profile ); thumbnail->export_profile );
if( vips_colourspace( in, &t[7], if( vips_colourspace( in, &t[7],
VIPS_INTERPRETATION_XYZ, NULL ) || VIPS_INTERPRETATION_XYZ, NULL ) ||
vips_icc_export( t[7], &t[8], vips_icc_export( t[7], &t[10],
"output_profile", "output_profile",
thumbnail->export_profile, thumbnail->export_profile,
"intent", thumbnail->intent, "intent", thumbnail->intent,
NULL ) ) NULL ) )
return( -1 ); return( -1 );
in = t[8]; in = t[10];
} }
} }
else if( thumbnail->linear ) { else if( thumbnail->linear ) {