← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gimp/trusty

« back to all changes in this revision

Viewing changes to plug-ins/common/lcms.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-08 13:26:03 UTC
  • mfrom: (1.1.28) (0.4.19 sid)
  • Revision ID: package-import@ubuntu.com-20130308132603-h14fmrgazi3roobr
Tags: 2.8.4-1ubuntu1
https://launchpad.net/bugs/1132767
* Synchronize with Debian (LP: #1132767). Remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates
* Dropped changes:
  - CVE-2012-5576.patch: Applied in new version
  - fix-python-multiarch-includes.patch: No longer needed
* debian/patches/link-against-lm.patch:
  - Link against lm to fix underlinking build failure
* debian/control, debian/rules:
  - Run autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/common/lcms.c
1004
1004
{
1005
1005
  cmsHTRANSFORM   transform;
1006
1006
  guchar         *cmap;
1007
 
  gint            num_colors;
 
1007
  gint            n_cmap_bytes;
1008
1008
 
1009
 
  cmap = gimp_image_get_colormap (image, &num_colors);
 
1009
  cmap = gimp_image_get_colormap (image, &n_cmap_bytes);
1010
1010
 
1011
1011
  transform = cmsCreateTransform (src_profile,  TYPE_RGB_8,
1012
1012
                                  dest_profile, TYPE_RGB_8,
1015
1015
 
1016
1016
  if (transform)
1017
1017
    {
1018
 
      cmsDoTransform (transform, cmap, cmap, num_colors);
1019
 
      cmsDeleteTransform(transform);
 
1018
      cmsDoTransform (transform, cmap, cmap, n_cmap_bytes / 3);
 
1019
      cmsDeleteTransform (transform);
1020
1020
    }
1021
1021
  else
1022
1022
    {
1023
1023
      g_warning ("cmsCreateTransform() failed!");
1024
1024
    }
1025
1025
 
1026
 
  gimp_image_set_colormap (image, cmap, num_colors);
 
1026
  gimp_image_set_colormap (image, cmap, n_cmap_bytes);
1027
1027
}
1028
1028
 
1029
1029
static void