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

Fix leak of heap-allocated mutexes

Browse Source
This commit is contained in:
George Hilliard 2018-11-02 01:11:00 -05:00
parent 77eccdf13d
commit 5081c85f26
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/rtlensfun.cc
View File

@ -33,7 +33,7 @@ extern const Settings *settings;
LFModifier::~LFModifier() LFModifier::~LFModifier()
{ {
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfModifierMutex); MyMutex::MyLock lock(lfModifierMutex);
data_->Destroy(); data_->Destroy();
} }
} }
@ -113,14 +113,14 @@ void LFModifier::correctCA(double &x, double &y, int cx, int cy, int channel) co
void LFModifier::processVignetteLine(int width, int y, float *line) const void LFModifier::processVignetteLine(int width, int y, float *line) const
{ {
MyMutex::MyLock lock(*lfModifierMutex); MyMutex::MyLock lock(lfModifierMutex);
data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_1(INTENSITY), 0); data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_1(INTENSITY), 0);
} }
void LFModifier::processVignetteLine3Channels(int width, int y, float *line) const void LFModifier::processVignetteLine3Channels(int width, int y, float *line) const
{ {
MyMutex::MyLock lock(*lfModifierMutex); MyMutex::MyLock lock(lfModifierMutex);
data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_3(RED, GREEN, BLUE), 0); data_->ApplyColorModification(line, 0, y, width, 1, LF_CR_3(RED, GREEN, BLUE), 0);
} }
@ -160,7 +160,6 @@ LFModifier::LFModifier(lfModifier *m, bool swap_xy, int flags):
swap_xy_(swap_xy), swap_xy_(swap_xy),
flags_(flags) flags_(flags)
{ {
lfModifierMutex = new MyMutex;
} }
@ -378,14 +377,13 @@ bool LFDatabase::LoadDirectory(const char *dirname)
LFDatabase::LFDatabase(): LFDatabase::LFDatabase():
data_(nullptr) data_(nullptr)
{ {
lfDBMutex = new MyMutex;
} }
LFDatabase::~LFDatabase() LFDatabase::~LFDatabase()
{ {
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
data_->Destroy(); data_->Destroy();
} }
} }
@ -401,7 +399,7 @@ std::vector<LFCamera> LFDatabase::getCameras() const
{ {
std::vector<LFCamera> ret; std::vector<LFCamera> ret;
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto cams = data_->GetCameras(); auto cams = data_->GetCameras();
while (*cams) { while (*cams) {
ret.emplace_back(); ret.emplace_back();
@ -417,7 +415,7 @@ std::vector<LFLens> LFDatabase::getLenses() const
{ {
std::vector<LFLens> ret; std::vector<LFLens> ret;
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto lenses = data_->GetLenses(); auto lenses = data_->GetLenses();
while (*lenses) { while (*lenses) {
ret.emplace_back(); ret.emplace_back();
@ -433,7 +431,7 @@ LFCamera LFDatabase::findCamera(const Glib::ustring &make, const Glib::ustring &
{ {
LFCamera ret; LFCamera ret;
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto found = data_->FindCamerasExt(make.c_str(), model.c_str()); auto found = data_->FindCamerasExt(make.c_str(), model.c_str());
if (found) { if (found) {
ret.data_ = found[0]; ret.data_ = found[0];
@ -448,7 +446,7 @@ LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) c
{ {
LFLens ret; LFLens ret;
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto found = data_->FindLenses(camera.data_, nullptr, name.c_str()); auto found = data_->FindLenses(camera.data_, nullptr, name.c_str());
for (size_t pos = 0; !found && pos < name.size(); ) { for (size_t pos = 0; !found && pos < name.size(); ) {
// try to split the maker from the model of the lens -- we have to // try to split the maker from the model of the lens -- we have to
@ -486,7 +484,7 @@ std::unique_ptr<LFModifier> LFDatabase::getModifier(const LFCamera &camera, cons
{ {
std::unique_ptr<LFModifier> ret; std::unique_ptr<LFModifier> ret;
if (data_) { if (data_) {
MyMutex::MyLock lock(*lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
if (camera && lens) { if (camera && lens) {
lfModifier *mod = lfModifier::Create(lens.data_, camera.getCropFactor(), width, height); lfModifier *mod = lfModifier::Create(lens.data_, camera.getCropFactor(), width, height);
int flags = LF_MODIFY_DISTORTION | LF_MODIFY_SCALE | LF_MODIFY_TCA; int flags = LF_MODIFY_DISTORTION | LF_MODIFY_SCALE | LF_MODIFY_TCA;

4
rtengine/rtlensfun.h
View File

@ -57,7 +57,7 @@ private:
lfModifier *data_; lfModifier *data_;
bool swap_xy_; bool swap_xy_;
int flags_; int flags_;
MyMutex *lfModifierMutex; mutable MyMutex lfModifierMutex;
}; };
class LFCamera final class LFCamera final
@ -122,7 +122,7 @@ private:
LFDatabase(); LFDatabase();
bool LoadDirectory(const char *dirname); bool LoadDirectory(const char *dirname);
MyMutex *lfDBMutex; mutable MyMutex lfDBMutex;
static LFDatabase instance_; static LFDatabase instance_;
lfDatabase *data_; lfDatabase *data_;
}; };