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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-11-28 06:50:05 +01:00
parent f5a5b9a3f5 55709bc449
commit d645dc5951
75 changed files with 181 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/thumbnail.cc
View File

@@ -592,10 +592,8 @@ void Thumbnail::decreaseRef ()
cachemgr->closeThumbnail (this);
}
void Thumbnail::getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams)
int Thumbnail::getThumbnailWidth (const int h, const rtengine::procparams::ProcParams *pparams) const
{
MyMutex::MyLock lock(mutex);
int tw_ = tw;
int th_ = th;
float imgRatio_ = imgRatio;
@@ -615,20 +613,17 @@ void Thumbnail::getThumbnailSize (int &w, int &h, const rtengine::procparams::Pr
if (thisCoarse != ppCoarse) {
// different orientation -> swapping width & height
int tmp = th_;
th_ = tw_;
tw_ = tmp;
std::swap(th_, tw_);
if (imgRatio_ >= 0.0001f) {
imgRatio_ = 1.f / imgRatio_;
}
}
}
if (imgRatio_ > 0.) {
w = (int)(imgRatio_ * (float)h);
if (imgRatio_ > 0.f) {
return imgRatio_ * h;
} else {
w = tw_ * h / th_;
return tw_ * h / th_;
}
}