Second and last part of issue 898 bugfix : Thumbnails aren't updated when toggling "Info" on/off

This patch also solve the skewed thumbnails bug
Credits: Oduis / Hombre
This commit is contained in:
natureh
2011-08-23 23:22:17 +02:00
parent c7ce3611e2
commit 2f3549653a
5 changed files with 25 additions and 13 deletions

View File

@@ -85,6 +85,7 @@ void Thumbnail::_generateThumbnailImage () {
lastImg = NULL;
tw = -1;
th = options.maxThumbnailHeight;
imgRatio = -1.;
// generate thumbnail image
Glib::ustring ext = getExtension (fname);
@@ -388,8 +389,13 @@ void Thumbnail::getThumbnailSize (int &w, int &h) {
#endif
w=0;
if (!initial_ && tpp) w = tpp->getImageWidth (getProcParams(), h); // this might return 0 if image was just building
if (w==0) w = tw * h / th;
if (!initial_ && tpp) w = tpp->getImageWidth (getProcParams(), h, imgRatio); // this might return 0 if image was just building
if (w==0) {
if (imgRatio > 0.)
w = (int)(imgRatio * (float)h);
else
w = tw * h / th;
}
}
void Thumbnail::getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h) {