← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gimp/intrepid-updates

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-11-21 17:39:07 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121173907-od54p9hdtvn5frl0
Tags: 2.4.1-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes.
  - Weave i18n magic in the rules file.
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Apply patch from upstream (SVN r23659) that corrects the image
    disappearing for large images at 150% zoom.
  - Symlink doc directories to avoid duplicate files, CDBS does this for
    us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/common/depthmerge.c
137
137
static void util_convertColorspace (guchar       *dest,
138
138
                                    gint          destBPP,
139
139
                                    gboolean      destHasAlpha,
140
 
                                    guchar       *source,
 
140
                                    const guchar *source,
141
141
                                    gint          sourceBPP,
142
142
                                    gboolean      sourceHasAlpha,
143
143
                                    gint          length);
1095
1095
   likes gray and rgb best, of course.  Others will be creatively mutilated,
1096
1096
   and even rgb->gray is pretty bad */
1097
1097
static void
1098
 
util_convertColorspace (guchar   *dest,
1099
 
                        gint      destBPP,
1100
 
                        gboolean  destHasAlpha,
1101
 
                        guchar   *source,
1102
 
                        gint      sourceBPP,
1103
 
                        gboolean  sourceHasAlpha,
1104
 
                        gint      length)
 
1098
util_convertColorspace (guchar       *dest,
 
1099
                        gint          destBPP,
 
1100
                        gboolean      destHasAlpha,
 
1101
                        const guchar *source,
 
1102
                        gint          sourceBPP,
 
1103
                        gboolean      sourceHasAlpha,
 
1104
                        gint          length)
1105
1105
{
1106
1106
  gint i, j;
1107
1107
  gint sourcePos, destPos;
1185
1185
               i < length;
1186
1186
               i++, destPos += destBPP, sourcePos += sourceBPP)
1187
1187
            {
1188
 
              for (i = 0; i < length; i++)
1189
 
                dest[destPos] = source[sourcePos];
 
1188
              dest[destPos] = source[sourcePos];
1190
1189
            }
1191
1190
        }
1192
1191
      else