Merge with 572a875474cb7c02682801dc30daab16a0d3c20b

2013-01-27 01:09:04 +01:00
parent f3e0647a32
commit ee33ca0b7d
25 changed files with 808 additions and 575 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -115,6 +115,7 @@ class ImProcCoordinator : public StagedImageProcessor {
        ProgressListener* plistener;
        PreviewImageListener* imageListener;
        AutoExpListener* aeListener;
+        AutoCamListener* acListener;
        HistogramListener* hListener;
        std::vector<SizeListener*> sizeListeners;

@@ -184,6 +185,7 @@ class ImProcCoordinator : public StagedImageProcessor {
        void delSizeListener     (SizeListener* il)      {std::vector<SizeListener*>::iterator it = std::find (sizeListeners.begin(), sizeListeners.end(), il); if (it!=sizeListeners.end()) sizeListeners.erase (it); }
        void setAutoExpListener  (AutoExpListener* ael)  {aeListener = ael; }
        void setHistogramListener(HistogramListener *h)  {hListener = h; }
+        void setAutoCamListener  (AutoCamListener* acl)  {acListener = acl; }

        void saveInputICCReference (const Glib::ustring& fname);