← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/database/databasethumbnailinfoprovider.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/database/databasethumbnailinfoprovider.cpp
43
43
{
44
44
    // If code here proves to be a bottleneck we can add custom queries to albumdb to retrieve info all-in-one
45
45
    ImageInfo imageinfo(KUrl::fromPath(path));
 
46
 
46
47
    if (imageinfo.isNull())
 
48
    {
47
49
        return ThumbnailCreator::fileThumbnailInfo(path);
 
50
    }
48
51
 
49
52
    ThumbnailInfo thumbinfo;
50
53
    QVariantList values;
54
57
 
55
58
    DatabaseAccess access;
56
59
    values = access.db()->getImagesFields(imageinfo.id(),
57
 
             DatabaseFields::ModificationDate | DatabaseFields::FileSize | DatabaseFields::UniqueHash);
 
60
                                          DatabaseFields::ModificationDate | DatabaseFields::FileSize | DatabaseFields::UniqueHash);
 
61
 
58
62
    if (!values.isEmpty())
59
63
    {
60
64
        thumbinfo.modificationDate = values[0].toDateTime();
63
67
    }
64
68
 
65
69
    values = access.db()->getImageInformation(imageinfo.id(), DatabaseFields::Orientation);
 
70
 
66
71
    if (!values.isEmpty())
 
72
    {
67
73
        thumbinfo.orientationHint = values.first().toInt();
 
74
    }
68
75
 
69
76
    return thumbinfo;
70
77
}