dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

define HAVE_LCMS if lcms is available. 

2007-09-27  Sven Neumann  <sven@gimp.org>

	* configure.in: define HAVE_LCMS if lcms is available.

	* plug-ins/jpeg/Makefile.am: link with LIBLCMS.

	* plug-ins/jpeg/jpeg-load.c (load_image): when loading a CMYK JPEG
	file and it comes with an embedded CMYK profile, use lcms to do
	the colorspace conversion.

svn path=/trunk/; revision=23672
This commit is contained in:
Sven Neumann 2007-09-27 15:09:50 +00:00 committed by Sven Neumann
parent d920ed2eae
commit d5afc9128b
4 changed files with 85 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-09-27 Sven Neumann <sven@gimp.org>
* configure.in: define HAVE_LCMS if lcms is available.
* plug-ins/jpeg/Makefile.am: link with LIBLCMS.
* plug-ins/jpeg/jpeg-load.c (load_image): when loading a CMYK JPEG
file and it comes with an embedded CMYK profile, use lcms to do
the colorspace conversion.
2007-09-27 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg-load.c (load_thumbnail_image): same change

1
configure.in
View File

@ -1377,6 +1377,7 @@ if test "x$with_lcms" != xno; then
])
])
if test $have_lcms = yes; then
AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available]),
LIBLCMS="-llcms"
LCMS='lcms$(EXEEXT)'
else

1
plug-ins/jpeg/Makefile.am
View File

@ -52,6 +52,7 @@ jpeg_LDADD = \
$(libgimpmath) \
$(libgimpbase) \
$(LIBJPEG) \
$(LIBLCMS) \
$(GTK_LIBS) \
$(EXIF_LIBS) \
$(RT_LIBS) \

72
plug-ins/jpeg/jpeg-load.c
View File

@ -31,6 +31,14 @@
#include <libexif/exif-data.h>
#endif /* HAVE_EXIF */
#ifdef HAVE_LCMS
#ifdef HAVE_LCMS_LCMS_H
#include <lcms/lcms.h>
#else
#include <lcms.h>
#endif
#endif
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
@ -50,7 +58,8 @@ static void jpeg_load_resolution (gint32 image_ID,
static void jpeg_sanitize_comment (gchar *comment);
static void jpeg_load_cmyk_to_rgb (guchar *buf,
glong pixels);
glong pixels,
gpointer transform);
GimpDrawable *drawable_global;
@ -82,6 +91,12 @@ load_image (const gchar *filename,
jpeg_saved_marker_ptr marker;
gint orientation = 0;
#ifdef HAVE_LCMS
cmsHTRANSFORM cmyk_transform = NULL;
#else
gpointer cmyk_transform = NULL;
#endif
/* We set up the normal JPEG error routines. */
cinfo.err = jpeg_std_error (&jerr.pub);
jerr.pub.error_exit = my_error_exit;
@ -364,12 +379,44 @@ load_image (const gchar *filename,
/* Step 5.3: check for an embedded ICC profile in APP2 markers */
if (jpeg_icc_read_profile (&cinfo, &profile, &profile_size))
{
GimpParasite *parasite = gimp_parasite_new ("icc-profile",
#ifdef HAVE_LCMS
if (cinfo.out_color_space == JCS_CMYK)
{
cmsHPROFILE cmyk_profile;
cmyk_profile = cmsOpenProfileFromMem (profile, profile_size);
if (cmyk_profile)
{
if (cmsGetColorSpace (cmyk_profile) == icSigCmykData)
{
cmsHPROFILE rgb_profile = cmsCreate_sRGBProfile ();
cmyk_transform =
cmsCreateTransform (cmyk_profile, TYPE_CMYK_8_REV,
rgb_profile, TYPE_RGB_8,
0, 0);
cmsCloseProfile (rgb_profile);
}
cmsCloseProfile (cmyk_profile);
}
}
#endif
/* don't attach the CMYK profile we are using to convert the data */
if (! cmyk_transform)
{
GimpParasite *parasite;
parasite = gimp_parasite_new ("icc-profile",
GIMP_PARASITE_PERSISTENT |
GIMP_PARASITE_UNDOABLE,
profile_size, profile);
gimp_image_parasite_attach (image_ID, parasite);
gimp_parasite_free (parasite);
}
g_free (profile);
}
@ -397,7 +444,8 @@ load_image (const gchar *filename,
jpeg_read_scanlines (&cinfo, (JSAMPARRAY) &rowbuf[i], 1);
if (cinfo.out_color_space == JCS_CMYK)
jpeg_load_cmyk_to_rgb (buf, drawable->width * scanlines);
jpeg_load_cmyk_to_rgb (buf, drawable->width * scanlines,
cmyk_transform);
gimp_pixel_rgn_set_rect (&pixel_rgn, buf,
0, start, drawable->width, scanlines);
@ -414,6 +462,11 @@ load_image (const gchar *filename,
* with the stdio data source.
*/
#ifdef HAVE_LCMS
if (cmyk_transform)
cmsDeleteTransform (cmyk_transform);
#endif
/* Step 8: Release JPEG decompression object */
/* This is an important step since it will release a good deal of memory. */
@ -749,7 +802,7 @@ load_thumbnail_image (const gchar *filename,
jpeg_read_scanlines (&cinfo, (JSAMPARRAY) &rowbuf[i], 1);
if (cinfo.out_color_space == JCS_CMYK)
jpeg_load_cmyk_to_rgb (buf, drawable->width * scanlines);
jpeg_load_cmyk_to_rgb (buf, drawable->width * scanlines, NULL);
gimp_pixel_rgn_set_rect (&pixel_rgn, buf,
0, start, drawable->width, scanlines);
@ -864,11 +917,20 @@ load_thumbnail_image (const gchar *filename,
static void
jpeg_load_cmyk_to_rgb (guchar *buf,
glong pixels)
glong pixels,
gpointer transform)
{
const guchar *src = buf;
guchar *dest = buf;
#ifdef HAVE_LCMS
if (transform)
{
cmsDoTransform (transform, buf, buf, pixels);
return;
}
#endif
while (pixels--)
{
guint c = src[0];