← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/core/gimpimage-convert.c

  • Committer: Bazaar Package Importer
  • Author(s): Ari Pollak
  • Date: 2009-08-14 09:57:17 UTC
  • mto: (1.1.21 upstream) (0.1.5 squeeze)
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: james.westby@ubuntu.com-20090814095717-37dh2xqy5t0rurpk
Import upstream version 2.6.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/core/gimpimage-convert.c
2959
2959
 
2960
2960
                  if (alpha_dither)
2961
2961
                    {
2962
 
                      if ((src[ALPHA_G_PIX] << 6) < (255 * dmval))
 
2962
                      if (src[ALPHA_G_PIX] < dmval)
2963
2963
                        transparent = TRUE;
2964
2964
                    }
2965
2965
                  else
3193
3193
 
3194
3194
                  if (alpha_dither)
3195
3195
                    {
3196
 
                      if ((src[alpha_pix] << 6) < (255*dmval))
 
3196
                      if (src[alpha_pix] < dmval)
3197
3197
                        transparent = TRUE;
3198
3198
                    }
3199
3199
                  else