← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to core/libs/dimg/filters/hsl/hslsettings.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/dimg/filters/hsl/hslsettings.cpp
184
184
        hue = (double)(h) - 359.0;
185
185
    }
186
186
 
187
 
    double sat = ((double)s * (200.0/255.0)) - 100.0;
 
187
    double sat = ((double)s * (200.0 / 255.0)) - 100.0;
188
188
 
189
189
    d->hInput->blockSignals(true);
190
190
    d->sInput->blockSignals(true);
215
215
 
216
216
void HSLSettings::slotSChanged(double s)
217
217
{
218
 
    int sat = (int)((s + 100.0) * (255.0/200.0));
 
218
    int sat = (int)((s + 100.0) * (255.0 / 200.0));
219
219
 
220
220
    d->HSSelector->blockSignals(true);
221
221
    d->HSSelector->setYValue(sat);