← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hugin/trusty-proposed

« back to all changes in this revision

Viewing changes to src/hugin_base/panodata/SrcPanoImage.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2011-01-06 14:28:24 UTC
  • mfrom: (1.1.9 upstream) (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110106142824-zn9lxylg5z44dynn
* Drop Cyril Brulebois from Uploaders. Thank you very much for your work.
* Bump package version. (rc3 was re-released as 2010.4.0).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hugin_base/panodata/SrcPanoImage.cpp
749
749
{
750
750
    Exiv2::ExifKey key(keyName);
751
751
    Exiv2::ExifData::iterator itr = exifData.findKey(key);
752
 
    if (itr != exifData.end()) {
 
752
    if (itr != exifData.end() && itr->count()) {
753
753
        value = itr->toLong();
754
754
        DEBUG_DEBUG("" << keyName << ": " << value);
755
755
        return true;
763
763
{
764
764
    Exiv2::ExifKey key(keyName);
765
765
    Exiv2::ExifData::iterator itr = exifData.findKey(key);
766
 
    if (itr != exifData.end()) {
 
766
    if (itr != exifData.end() && itr->count()) {
767
767
        value = itr->toFloat();
768
768
        DEBUG_DEBUG("" << keyName << ": " << value);
769
769
        return true;
777
777
{
778
778
    Exiv2::ExifKey key(keyName);
779
779
    Exiv2::ExifData::iterator itr = exifData.findKey(key);
780
 
    if (itr != exifData.end()) {
 
780
    if (itr != exifData.end() && itr->count()) {
781
781
        value = itr->toString();
782
782
        DEBUG_DEBUG("" << keyName << ": " << value);
783
783
        return true;
819
819
    {
820
820
        for(unsigned int i=0;i<masks.size();i++)
821
821
        {
822
 
            if(masks[i].getMaskType()==MaskPolygon::Mask_positive)
 
822
            if(masks[i].getMaskType()==MaskPolygon::Mask_positive || masks[i].getMaskType()==MaskPolygon::Mask_Stack_positive)
823
823
            {
824
824
                return true;
825
825
            };