0002-xmp-convert-metadata-store-from-std-vector-to-std-mu.patch - Exiv2

             return *this;
+        }
         bool XmpKey::operator<(const XmpKey& b) const
+        {
             if (this->groupName() != b.groupName()) {
                 return this->groupName() < b.groupName();
+            }
             return this->tagName() < b.tagName();
+        }
         XmpKey::AutoPtr XmpKey::clone() const
+        {
             return AutoPtr(clone_());

             //@{
             //! Assignment operator.
             XmpKey& operator=(const XmpKey& rhs);
             //! Comparison operator.
             bool operator<(const XmpKey& b) const;
             //@}
             //! @name Accessors

     // *****************************************************************************
     // local declarations
     namespace {
         //! Unary predicate that matches an Xmpdatum by key
         class FindXmpdatum {
         public:
             //! Constructor, initializes the object with key
             FindXmpdatum(const Exiv2::XmpKey& key)
                 : key_(key.key()) {}
             /*!
               @brief Returns true if prefix and property of the argument
                      Xmpdatum are equal to that of the object.
             */
             bool operator()(const Exiv2::Xmpdatum& xmpdatum) const
                 { return key_ == xmpdatum.key(); }
         private:
             std::string key_;
         }; // class FindXmpdatum
     #ifdef EXV_HAVE_XMP_TOOLKIT
         //! Convert XMP Toolkit struct option bit to Value::XmpStruct
-...
             delete p_;
+        }
         const XmpKey& Xmpdatum::xmpKey() const
+        {
             if (p_->key_.get() == 0) throw Error(8);
             return *p_->key_;
+        }
         std::string Xmpdatum::key() const
+        {
             return p_->key_.get() == 0 ? "" : p_->key_->key();
-...
         Xmpdatum& XmpData::operator[](const std::string& key)
+        {
             XmpKey xmpKey(key);
             iterator pos = findKey(xmpKey);
             if (pos == end()) {
                 add(Xmpdatum(xmpKey));
                 pos = findKey(xmpKey);
             XmpKey k = XmpKey(key);
             XmpMetadata::iterator it = xmpMetadata_.find(k);
             if (it != xmpMetadata_.end()) {
                 return it->second;
+            }
             return *pos;
             add(Xmpdatum(k));
             return (*this)[key];
+        }
         int XmpData::add(const XmpKey& key, const Value* value)
-...
         int XmpData::add(const Xmpdatum& xmpDatum)
+        {
             xmpMetadata_.push_back(xmpDatum);
             xmpMetadata_.insert(std::make_pair(xmpDatum.xmpKey(), xmpDatum));
             return 0;
+        }
         XmpData::const_iterator XmpData::findKey(const XmpKey& key) const
+        {
             return std::find_if(xmpMetadata_.begin(), xmpMetadata_.end(),
                                 FindXmpdatum(key));
             return xmpMetadata_.find(key);
+        }
         XmpData::iterator XmpData::findKey(const XmpKey& key)
+        {
             return std::find_if(xmpMetadata_.begin(), xmpMetadata_.end(),
                                 FindXmpdatum(key));
             return xmpMetadata_.find(key);
+        }
         void XmpData::clear()
-...
         void XmpData::sortByKey()
+        {
             std::sort(xmpMetadata_.begin(), xmpMetadata_.end(), cmpMetadataByKey);
             return;  // multimap is kept sorted by key
+        }
         XmpData::const_iterator XmpData::begin() const
-...
         XmpData::iterator XmpData::erase(XmpData::iterator pos)
+        {
             return xmpMetadata_.erase(pos);
             XmpData::iterator next = pos;
             next++;
             xmpMetadata_.erase(pos.it);
             return next;
+        }
         bool XmpParser::initialized_ = false;

                      contain multiple metadata with the same key.
              */
             std::string key() const;
             const XmpKey& xmpKey() const;
             const char* familyName() const;
             //! Return the (preferred) schema namespace prefix.
             std::string groupName() const;
-...
         }; // class Xmpdatum
         //! Container type to hold all metadata
         typedef std::vector<Xmpdatum> XmpMetadata;
         typedef std::multimap<XmpKey, Xmpdatum> XmpMetadata;
         /*!
           @brief A container for XMP data. This is a top-level class of
-...
         class EXIV2API XmpData {
         public:
             //! XmpMetadata iterator type
             typedef XmpMetadata::iterator iterator;
             typedef map_value_iterator<XmpMetadata, XmpMetadata::iterator> iterator;
             //! XmpMetadata const iterator type
             typedef XmpMetadata::const_iterator const_iterator;
             typedef map_value_iterator<XmpMetadata, XmpMetadata::const_iterator, const typename XmpMetadata::const_iterator::value_type::second_type> const_iterator;
             //! @name Manipulators
             //@{
-...
             iterator erase(iterator pos);
             //! Delete all Xmpdatum instances resulting in an empty container.
             void clear();
             //! Sort metadata by key
             /*!
               @deprecated Xmp metadata is always kept sorted by key.
                     This method is a no-op.
              */
             void sortByKey();
             //! Begin of the metadata
             iterator begin();
+    -

Project

General

Profile

Exiv2

Patch #967 » 0002-xmp-convert-metadata-store-from-std-vector-to-std-mu.patch