Solving issue 1684: "thumbnail.cc uses Glib::Mutex recusively" ; this changeset introduce a new MyMutex and MyMutex::MyLock class that has to be used instead of Glib ones

2013-08-11 23:33:10 +02:00
parent 987e4dcd89
commit f512d74323
55 changed files with 1037 additions and 751 deletions
--- a/rtengine/image16.h
+++ b/rtengine/image16.h
@@ -51,7 +51,7 @@ class Image16 : public IImage16, public ImageIO {
        virtual void         setScanline (int row, unsigned char* buffer, int bps, float *minValue=NULL, float *maxValue=NULL);

        // functions inherited from IImage16:
-        virtual Glib::Mutex& getMutex () { return mutex (); }
+        virtual MyMutex&     getMutex () { return mutex (); }
        virtual cmsHPROFILE  getProfile () { return getEmbeddedProfile (); }
        virtual int          getBitsPerPixel () { return 8*sizeof(unsigned short); }
        virtual int          saveToFile (Glib::ustring fname) { return save (fname); }