← Back to branch summary

~ubuntu-branches/ubuntu/quantal/digikam/quantal

« back to all changes in this revision

Viewing changes to core/imageplugins/enhance/restorationtool.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/imageplugins/enhance/restorationtool.cpp
328
328
void RestorationTool::prepareFinal()
329
329
{
330
330
    ImageIface iface(0, 0);
331
 
    uchar* data = iface.getOriginalImage();
 
331
    QScopedArrayPointer<uchar> data(iface.getOriginalImage());
332
332
    DImg originalImage(iface.originalWidth(), iface.originalHeight(),
333
 
                       iface.originalSixteenBit(), iface.originalHasAlpha(), data);
 
333
                       iface.originalSixteenBit(), iface.originalHasAlpha(), data.data());
334
334
 
335
335
    setFilter(new GreycstorationFilter(&originalImage,
336
336
                                       d->settingsWidget->settings(), GreycstorationFilter::Restore,
337
337
                                       0, 0, QImage(), this));
338
 
 
339
 
    delete [] data;
340
338
}
341
339
 
342
340
void RestorationTool::putPreviewData()