← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/digikam/oneiric

« back to all changes in this revision

Viewing changes to libs/threadimageio/loadingdescription.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rohan Garg
  • Date: 2011-01-25 15:54:05 UTC
  • mfrom: (3.1.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20110125155405-cn810n9ufqcqdqab
Tags: 2:1.8.0-1ubuntu1
* Merge with debian, remaining 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/threadimageio/loadingdescription.cpp
6
6
 * Date        : 2007-02-03
7
7
 * Description : Loading parameters for multithreaded loading
8
8
 *
9
 
 * Copyright (C) 2006-2010 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
 
9
 * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
10
10
 *
11
11
 * This program is free software; you can redistribute it
12
12
 * and/or modify it under the terms of the GNU General
32
32
 
33
33
bool LoadingDescription::PreviewParameters::operator==(const PreviewParameters& other) const
34
34
{
35
 
    return type          == other.type
36
 
           && size       == other.size
37
 
           && exifRotate == other.exifRotate;
 
35
    return type       == other.type &&
 
36
           size       == other.size &&
 
37
           exifRotate == other.exifRotate;
38
38
}
39
39
 
40
40
bool LoadingDescription::PostProcessingParameters::operator==(const PostProcessingParameters& other) const
80
80
LoadingDescription::LoadingDescription(const QString& filePath, ColorManagementSettings cm)
81
81
    : filePath(filePath)
82
82
{
83
 
    rawDecodingSettings = DRawDecoding();
84
 
    rawDecodingHint     = RawDecodingDefaultSettings;
 
83
    rawDecodingSettings                      = DRawDecoding();
 
84
    rawDecodingHint                          = RawDecodingDefaultSettings;
85
85
    postProcessingParameters.colorManagement = cm;
86
86
}
87
87
 
97
97
                                       LoadingDescription::PreviewParameters::PreviewType type)
98
98
    : filePath(filePath)
99
99
{
100
 
    rawDecodingSettings          = DRawDecoding();
101
 
    rawDecodingHint              = RawDecodingDefaultSettings;
102
 
    previewParameters.type       = type;
103
 
    previewParameters.size       = size;
104
 
    previewParameters.exifRotate = exifRotate;
 
100
    rawDecodingSettings                      = DRawDecoding();
 
101
    rawDecodingHint                          = RawDecodingDefaultSettings;
 
102
    previewParameters.type                   = type;
 
103
    previewParameters.size                   = size;
 
104
    previewParameters.exifRotate             = exifRotate;
105
105
    postProcessingParameters.colorManagement = cm;
106
106
}
107
107
 
252
252
bool LoadingDescription::isReducedVersion() const
253
253
{
254
254
    // return true if this loads anything but the full version
255
 
    return rawDecodingSettings.rawPrm.halfSizeColorImage
256
 
           || previewParameters.type != PreviewParameters::NoPreview;
 
255
    return rawDecodingSettings.rawPrm.halfSizeColorImage ||
 
256
           previewParameters.type != PreviewParameters::NoPreview;
257
257
}
258
258
 
259
259
bool LoadingDescription::operator==(const LoadingDescription& other) const