Committing patch from issue 1240: "Partial profile handling"

2012-02-26 03:23:08 +01:00
parent c21fa69aea
commit dd93fff44c
60 changed files with 2243 additions and 2214 deletions
--- a/rtengine/imagedata.h
+++ b/rtengine/imagedata.h
@@ -55,7 +55,7 @@ class ImageData : public ImageMetaData {
    virtual ~ImageData ();

    const rtexif::TagDirectory*   getExifData () const { return root; }
-    const std::vector<procparams::IPTCPair> getIPTCData () const;
+    const procparams::IPTCPairs   getIPTCData () const;

    bool hasExif () const { return root && root->getCount(); }
    bool hasIPTC () const { return iptc; }