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

oop remove git markup

Browse Source
This commit is contained in:
John Cupitt 2019-04-24 16:11:08 +01:00
parent 8b71d0179c
commit bb22f66453
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvips/resample/thumbnail.c
View File

@ -587,13 +587,10 @@ vips_thumbnail_build( VipsObject *object )
/* In linear mode, we import right at the start.
*
<<<<<<< HEAD
* We also have to import the whole image if it's CMYK, since
* vips_colourspace() (see below) doesn't let you specify the fallback
* profile.
*
=======
>>>>>>> master
* This is only going to work for images in device space. If you have
* an image in PCS which also has an attached profile, strange things
* will happen.