← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/libs/dimg/filters/cb/cbsettings.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/cb/cbsettings.cpp
161
161
{
162
162
    CBContainer prm;
163
163
 
164
 
    prm.red   = ((double)d->rInput->value() + 100.0)/100.0;
165
 
    prm.green = ((double)d->gInput->value() + 100.0)/100.0;
166
 
    prm.blue  = ((double)d->bInput->value() + 100.0)/100.0;
 
164
    prm.red   = ((double)d->rInput->value() + 100.0) / 100.0;
 
165
    prm.green = ((double)d->gInput->value() + 100.0) / 100.0;
 
166
    prm.blue  = ((double)d->bInput->value() + 100.0) / 100.0;
167
167
 
168
168
    return prm;
169
169
}
190
190
{
191
191
    CBContainer prm;
192
192
 
193
 
    prm.red   = ((double)d->rInput->defaultValue() + 100.0)/100.0;
194
 
    prm.green = ((double)d->gInput->defaultValue() + 100.0)/100.0;
195
 
    prm.blue  = ((double)d->bInput->defaultValue() + 100.0)/100.0;
 
193
    prm.red   = ((double)d->rInput->defaultValue() + 100.0) / 100.0;
 
194
    prm.green = ((double)d->gInput->defaultValue() + 100.0) / 100.0;
 
195
    prm.blue  = ((double)d->bInput->defaultValue() + 100.0) / 100.0;
196
196
 
197
197
    return prm;
198
198
}