← Back to branch summary

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

« back to all changes in this revision

Viewing changes to imageplugins/color/hsltool.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:
imageplugins/color/hsltool.cpp
64
64
        hslSettings(0),
65
65
        previewWidget(0),
66
66
        gboxSettings(0)
67
 
        {}
 
67
    {}
68
68
 
69
69
    static const QString configGroupName;
70
70
    static const QString configHistogramChannelEntry;
83
83
// --------------------------------------------------------
84
84
 
85
85
HSLTool::HSLTool(QObject* parent)
86
 
       : EditorToolThreaded(parent),
87
 
         d(new HSLToolPriv)
 
86
    : EditorToolThreaded(parent),
 
87
      d(new HSLToolPriv)
88
88
{
89
89
    setObjectName("adjusthsl");
90
90
    setToolName(i18n("Hue / Saturation / Lightness"));
123
123
HSLTool::~HSLTool()
124
124
{
125
125
    if (d->destinationPreviewData)
126
 
       delete [] d->destinationPreviewData;
 
126
    {
 
127
        delete [] d->destinationPreviewData;
 
128
    }
127
129
 
128
130
    delete d;
129
131
}
173
175
    // Update histogram.
174
176
 
175
177
    if (d->destinationPreviewData)
176
 
       delete [] d->destinationPreviewData;
 
178
    {
 
179
        delete [] d->destinationPreviewData;
 
180
    }
177
181
 
178
182
    d->destinationPreviewData = preview.copyBits();
179
183
    d->gboxSettings->histogramBox()->histogram()->updateData(d->destinationPreviewData,
180
 
                                                             preview.width(), preview.height(), preview.sixteenBit(),
181
 
                                                             0, 0, 0, false);
 
184
            preview.width(), preview.height(), preview.sixteenBit(),
 
185
            0, 0, 0, false);
182
186
}
183
187
 
184
188
void HSLTool::prepareFinal()