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

Fix for crash when zooming thumbs in/out in File Browser tab. Committed on behalf of samtygier, issue 1675

Browse Source
This commit is contained in:
DrSlony
2013-02-14 22:28:03 +00:00
parent 50a5eb103c
commit 8ecdb0fdc1
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/thumbnail.cc
View File

@@ -409,20 +409,11 @@ void Thumbnail::decreaseRef ()
} }
void Thumbnail::getThumbnailSize (int &w, int &h) { void Thumbnail::getThumbnailSize (int &w, int &h) {
// TODO: Check for Linux
#ifdef WIN32
Glib::Mutex::Lock lock(mutex);
#endif
w=0;
if (!initial_ && tpp) w = tpp->getImageWidth (getProcParams(), h, imgRatio); // this might return 0 if image was just building
if (w==0) {
if (imgRatio > 0.) if (imgRatio > 0.)
w = (int)(imgRatio * (float)h); w = (int)(imgRatio * (float)h);
else else
w = tw * h / th; w = tw * h / th;
} }
}
void Thumbnail::getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h) { void Thumbnail::getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h) {
// TODO: Check for Linux // TODO: Check for Linux
@@ -653,7 +644,7 @@ void Thumbnail::_loadThumbnail(bool firstTrial) {
tpp->init (); tpp->init ();
} }
getThumbnailSize(tw,th); if (!initial_ && tpp) tw = tpp->getImageWidth (getProcParams(), th, imgRatio); // this might return 0 if image was just building
} }
void Thumbnail::loadThumbnail (bool firstTrial) { void Thumbnail::loadThumbnail (bool firstTrial) {