liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hombre
2013-08-11 23:33:10 +02:00
parent 987e4dcd89
commit f512d74323
55 changed files with 1037 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtengine/dcrop.cc
View File

@@ -1,4 +1,3 @@
/*
/*
* This file is part of RawTherapee.
*
@@ -53,15 +52,15 @@ Crop::~Crop () {
}
void Crop::setListener (DetailedCropListener* il) {
// We can make reads in the IF, because the mProcessing lock is only needed for change
if (cropImageListener!=il) {
Glib::Mutex::Lock lock(cropMutex);
cropImageListener = il;
}
}
// We can make reads in the IF, because the mProcessing lock is only needed for change
if (cropImageListener!=il) {
MyMutex::MyLock lock(cropMutex);
cropImageListener = il;
}
}
void Crop::update (int todo) {
Glib::Mutex::Lock lock(cropMutex);
MyMutex::MyLock lock(cropMutex);
ProcParams& params = parent->params;
@@ -89,7 +88,7 @@ void Crop::update (int todo) {
bool needstransform = parent->ipf.needsTransform();
if (todo & (M_INIT|M_LINDENOISE)) {
Glib::Mutex::Lock lock(parent->minit); // Also used in improccoord
MyMutex::MyLock lock(parent->minit); // Also used in improccoord
int tr = TR_NONE;
if (params.coarse.rotate==90) tr |= TR_R90;