← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/imageeditor/rawimport/rawpostprocessing.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:
utilities/imageeditor/rawimport/rawpostprocessing.cpp
40
40
{
41
41
 
42
42
RawPostProcessing::RawPostProcessing(DImg* orgImage, QObject* parent, const DRawDecoding& settings)
43
 
                 : DImgThreadedFilter(orgImage, parent, "RawPostProcessing")
 
43
    : DImgThreadedFilter(orgImage, parent, "RawPostProcessing")
44
44
{
45
45
    m_customRawSettings = settings;
46
46
    initFilter();
49
49
RawPostProcessing::RawPostProcessing(DImgThreadedFilter* parentFilter,
50
50
                                     const DImg& orgImage, const DImg& destImage,
51
51
                                     int progressBegin, int progressEnd, const DRawDecoding& settings)
52
 
                 : DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd,
53
 
                                      parentFilter->filterName() + ": RawPostProcessing")
 
52
    : DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd,
 
53
                         parentFilter->filterName() + ": RawPostProcessing")
54
54
{
55
55
    m_customRawSettings = settings;
56
56
    filterImage();
70
70
{
71
71
    if (!m_orgImage.bits() || !m_orgImage.width() || !m_orgImage.height())
72
72
    {
73
 
       kWarning() << ("RawPostProcessing::rawPostProcessing: no image m_orgImage.bits() available!");
74
 
       return;
 
73
        kWarning() << ("RawPostProcessing::rawPostProcessing: no image m_orgImage.bits() available!");
 
74
        return;
75
75
    }
76
76
 
77
77
    if (!m_customRawSettings.postProcessingSettingsIsDirty())