Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default

This revision compiles and runs on Win7x64- but further evaluation is necessary.
There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder.
Additional notes:
- ImProcFunctions::hsv2rgb01   -> this likely need to be added to color.h & color.cc
- Use of array2D should be verified in NR code
- compilation warning for rtengine::RawImageSource::isWBProviderReady()

rtgui/icmpanel.h

@@ -19,6 +19,8 @@
 #ifndef _ICMPANEL_
 #define _ICMPANEL_
 
+#include <auto_ptr.h>
+
 #include <gtkmm.h>
 #include "adjuster.h"
 #include "guiutils.h"
@@ -48,6 +50,7 @@ class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolP
         Gtk::RadioButton*  icamera;
         Gtk::RadioButton*  icameraICC;
         Gtk::RadioButton*  ifromfile;
+        MyComboBoxText*    prefprof;
         Gtk::CheckButton*  ckbBlendCMSMatrix;
         MyComboBoxText*    wnames;
         MyComboBoxText*    wgamma;
@@ -57,13 +60,13 @@ class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolP
         Gtk::RadioButton*  ofromfile;
         Gtk::RadioButton*  iunchanged;
         MyFileChooserButton* ipDialog;
+        std::auto_ptr<FileChooserLastFolderPersister> ipDialogPersister;
         Gtk::RadioButton::Group opts;
         Gtk::Button*        saveRef;
         sigc::connection   ipc;
         Glib::ustring      oldip;
         ICMPanelListener*  icmplistener;
         
-        static Glib::ustring lastICCWorkDir;
         bool enableLastICCWorkDirChange;
 
     public:
@@ -83,6 +86,7 @@ class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolP
 		void GamChanged ();
         void ipSelectionChanged ();
         void iccTogglesChanged();
+        void prefProfChanged();
 
         void setRawMeta (bool raw, const rtengine::ImageData* pMeta);
         void saveReferencePressed ();