← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/dimg/drawdecoding.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dimg/drawdecoding.cpp
35
35
 
36
36
DRawDecoding::DRawDecoding(const RawDecodingSettings& prm)
37
37
{
38
 
    sixteenBitsImage        = prm.sixteenBitsImage;
39
 
    whiteBalance            = prm.whiteBalance;
40
 
    customWhiteBalance      = prm.customWhiteBalance;
41
 
    customWhiteBalanceGreen = prm.customWhiteBalanceGreen;
42
 
    RGBInterpolate4Colors   = prm.RGBInterpolate4Colors;
43
 
    unclipColors            = prm.unclipColors;
44
 
    DontStretchPixels       = prm.DontStretchPixels;
45
 
    enableNoiseReduction    = prm.enableNoiseReduction;
46
 
    medianFilterPasses      = prm.medianFilterPasses;
47
 
    NRThreshold             = prm.NRThreshold;
48
 
    enableCACorrection      = prm.enableCACorrection;
49
 
    caMultiplier[0]         = prm.caMultiplier[0];
50
 
    caMultiplier[1]         = prm.caMultiplier[1];
51
 
    RAWQuality              = prm.RAWQuality;
52
 
    inputColorSpace         = prm.inputColorSpace;
53
 
    outputColorSpace        = prm.outputColorSpace;
54
 
    inputProfile            = prm.inputProfile;
55
 
    outputProfile           = prm.outputProfile;
56
 
    autoBrightness          = prm.autoBrightness;
57
 
    fixColorsHighlights     = prm.fixColorsHighlights;
 
38
    rawPrm = prm;
58
39
 
59
40
    resetPostProcessingSettings();
60
41
}
65
46
 
66
47
void DRawDecoding::optimizeTimeLoading()
67
48
{
68
 
    RawDecodingSettings::optimizeTimeLoading();
 
49
    rawPrm.optimizeTimeLoading();
69
50
    resetPostProcessingSettings();
70
51
}
71
52
 
91
72
 
92
73
bool DRawDecoding::operator==(const DRawDecoding& other) const
93
74
{
94
 
    return lightness     == other.lightness    &&
95
 
           contrast      == other.contrast     &&
96
 
           gamma         == other.gamma        &&
97
 
           saturation    == other.saturation   &&
98
 
           exposureComp  == other.exposureComp &&
99
 
           curveAdjust   == other.curveAdjust;
 
75
    return rawPrm       == other.rawPrm       &&
 
76
           lightness    == other.lightness    &&
 
77
           contrast     == other.contrast     &&
 
78
           gamma        == other.gamma        &&
 
79
           saturation   == other.saturation   &&
 
80
           exposureComp == other.exposureComp &&
 
81
           curveAdjust  == other.curveAdjust;
 
82
}
 
83
 
 
84
DRawDecoding& DRawDecoding::operator=(const DRawDecoding& o)
 
85
{
 
86
    rawPrm       = o.rawPrm;
 
87
    lightness    = o.lightness;
 
88
    contrast     = o.contrast;
 
89
    gamma        = o.gamma;
 
90
    saturation   = o.saturation;
 
91
    exposureComp = o.exposureComp;
 
92
    curveAdjust  = o.curveAdjust;
 
93
    return *this;
100
94
}
101
95
 
102
96
}  // namespace Digikam