0003-exif-convert-metadata-store-from-std-vector-to-std-m.patch - Exiv2

     // *****************************************************************************
     namespace {
         //! Unary predicate that matches a Exifdatum with a given key
         class FindExifdatumByKey {
         public:
             //! Constructor, initializes the object with the key to look for
             FindExifdatumByKey(const std::string& key) : key_(key) {}
             /*!
               @brief Returns true if the key of \em exifdatum is equal
                      to that of the object.
             */
             bool operator()(const Exiv2::Exifdatum& exifdatum) const
+            {
                 return key_ == exifdatum.key();
+            }
         private:
             const std::string& key_;
         }; // class FindExifdatumByKey
         /*!
           @brief Exif %Thumbnail image. This abstract base class provides the
                  interface for the thumbnail image that is optionally embedded in
-...
             return value_.get() == 0 ? -1 : value_->setDataArea(buf, len);
+        }
         const ExifKey& Exifdatum::exifKey() const
+        {
             if (key_.get() == 0) throw Error(8);
             return *key_;
+        }
         std::string Exifdatum::key() const
+        {
             return key_.get() == 0 ? "" : key_->key();
-...
         Exifdatum& ExifData::operator[](const std::string& key)
+        {
             ExifKey exifKey(key);
             iterator pos = findKey(exifKey);
             if (pos == end()) {
                 add(Exifdatum(exifKey));
                 pos = findKey(exifKey);
             ExifKey k = ExifKey(key);
             ExifMetadata::iterator it = exifMetadata_.find(k);
             if (it != exifMetadata_.end()) {
                 return it->second;
+            }
             return *pos;
             add(Exifdatum(k));
             return (*this)[key];
+        }
         void ExifData::add(const ExifKey& key, const Value* pValue)
-...
         void ExifData::add(const Exifdatum& exifdatum)
+        {
             // allow duplicates
             exifMetadata_.push_back(exifdatum);
             exifMetadata_.insert(std::make_pair(exifdatum.exifKey(), exifdatum));
+        }
         ExifData::const_iterator ExifData::findKey(const ExifKey& key) const
+        {
             return std::find_if(exifMetadata_.begin(), exifMetadata_.end(),
                                 FindExifdatumByKey(key.key()));
             return exifMetadata_.find(key);
+        }
         ExifData::iterator ExifData::findKey(const ExifKey& key)
+        {
             return std::find_if(exifMetadata_.begin(), exifMetadata_.end(),
                                 FindExifdatumByKey(key.key()));
             return exifMetadata_.find(key);
+        }
         void ExifData::clear()
-...
         void ExifData::sortByKey()
+        {
             exifMetadata_.sort(cmpMetadataByKey);
             // map is sorted by ifdId then tag
+        }
         void ExifData::sortByTag()
+        {
             exifMetadata_.sort(cmpMetadataByTag);
             // map is already sorted by ifdId then tag
+        }
         ExifData::iterator ExifData::erase(ExifData::iterator beg, ExifData::iterator end)
+        {
             return exifMetadata_.erase(beg, end);
             ExifData::iterator next = end;
             next++;
             exifMetadata_.erase(beg.it, end.it);
             return next;
+        }
         ExifData::iterator ExifData::erase(ExifData::iterator pos)
+        {
             return exifMetadata_.erase(pos);
             ExifData::iterator next = pos;
             next++;
             exifMetadata_.erase(pos.it);
             return next;
+        }
         ByteOrder ExifParser::decode(

             //@{
             //! Return the key of the %Exifdatum.
             std::string key() const;
             const ExifKey& exifKey() const;
             const char* familyName() const;
             std::string groupName() const;
             std::string tagName() const;
-...
         }; // class ExifThumb
         //! Container type to hold all metadata
         typedef std::list<Exifdatum> ExifMetadata;
         typedef std::multimap<ExifKey, Exifdatum> ExifMetadata;
         /*!
           @brief A container for Exif data.  This is a top-level class of the %Exiv2
-...
         class EXIV2API ExifData {
         public:
             //! ExifMetadata iterator type
             typedef ExifMetadata::iterator iterator;
             typedef map_value_iterator<ExifMetadata, ExifMetadata::iterator> iterator;
             //! ExifMetadata const iterator type
             typedef ExifMetadata::const_iterator const_iterator;
             typedef map_value_iterator<ExifMetadata, ExifMetadata::const_iterator, const typename ExifMetadata::const_iterator::value_type::second_type> const_iterator;
             //! @name Manipulators
             //@{
-...
                      Note that this also removes thumbnails.
              */
             void clear();
             //! Sort metadata by key
             /*!
               @deprecated Exif metadata is always kept sorted by IfdId, then tag.
                     This method is a no-op.
              */
             void sortByKey();
             //! Sort metadata by tag
             /*!
               @deprecated Exif metadata is always kept sorted by IfdId, then tag.
                     This method is a no-op.
              */
             void sortByTag();
             //! Begin of the metadata
             iterator begin() { return exifMetadata_.begin(); }

             return *this;
+        }
         bool ExifKey::operator<(const ExifKey& b) const
+        {
             if (this->ifdId() != b.ifdId()) {
                 return this->ifdId() < b.ifdId();
+            }
             return this->tag() < b.tag();
+        }
         void ExifKey::setIdx(int idx)
+        {
             p_->idx_ = idx;

               @brief Assignment operator.
              */
             ExifKey& operator=(const ExifKey& rhs);
             //! Comparison operator.
             bool operator<(const ExifKey& b) const;
             //! Set the index.
             void setIdx(int idx);
             //@}
+    -

Project

General

Profile

Exiv2

Patch #967 » 0003-exif-convert-metadata-store-from-std-vector-to-std-m.patch