Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/imagedata.h
+++ b/rtengine/imagedata.h
@@ -52,10 +52,10 @@ class ImageData : public ImageMetaData {
  public:

    ImageData (Glib::ustring fname, RawMetaDataLocation* rml=NULL);
-    ~ImageData ();
+    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; }