← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric-security

« back to all changes in this revision

Viewing changes to app/base/levels.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-08-31 10:24:10 UTC
  • mfrom: (1.1.21 upstream) (0.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090831102410-eqawgw6fhdyi91ee
Tags: 2.6.7-1ubuntu1
https://launchpad.net/bugs/419593
* Merge with Debian unstable (LP: #419593), remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + updated some strings for ubuntu
  - debian/rules:
    + updated translation templates
  - debian/control:
    + Drop webkit build dependency. gimp is the only thing pulling in webkit
      for the desktop CDs, and makes them explode. Without the webkit help
      browser plugin, help will just be displayed in the default browser.
* debian/patches/01_debian-gimprc.patch:
  - Updated
* debian/control:
  - Added a BZR link

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/base/levels.c
91
91
          inten = (gdouble) (255.0 * inten - levels->low_input[j]);
92
92
        }
93
93
 
 
94
      /* clamp to new black and white points */
 
95
      inten = CLAMP (inten, 0.0, 1.0);
 
96
 
94
97
      if (levels->gamma[j] != 0.0)
95
98
        {
96
 
          if (inten >= 0.0)
97
 
            inten =  pow ( inten, (1.0 / levels->gamma[j]));
98
 
          else
99
 
            inten = -pow (-inten, (1.0 / levels->gamma[j]));
 
99
          inten =  pow ( inten, (1.0 / levels->gamma[j]));
100
100
        }
101
101
 
102
102
      /*  determine the output intensity  */