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

Batch queue/preview stability enhancements; see issue #611

Browse Source
This commit is contained in:
Oliver Duis
2011-04-02 11:12:22 +02:00
parent 5af8524ae2
commit 0de4f199f0
20 changed files with 138 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/previewhandler.cc
View File

@@ -183,9 +183,10 @@ void PreviewHandler::imageReady (CropParams cp) {
}
Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int x, int y, int w, int h, double zoom) {
Glib::Mutex::Lock lock(previewImgMutex);
Glib::RefPtr<Gdk::Pixbuf> resPixbuf;
previewImgMutex.lock ();
if (previewImg) {
double totalZoom = zoom*previewScale;
if (w>previewImg->get_width()*totalZoom)
@@ -206,14 +207,15 @@ Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int x, int y, int w, in
resPixbuf = Gdk::Pixbuf::create (Gdk::COLORSPACE_RGB, false, 8, w, h);
previewImg->scale (resPixbuf, 0, 0, w, h, -ix, -iy, totalZoom, totalZoom, Gdk::INTERP_NEAREST);
}
previewImgMutex.unlock ();
return resPixbuf;
}
Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int desiredW, int desiredH, double& zoom_) {
Glib::Mutex::Lock lock(previewImgMutex);
Glib::RefPtr<Gdk::Pixbuf> resPixbuf;
previewImgMutex.lock ();
if (previewImg) {
double zoom1 = (double)desiredW / previewImg->get_width();
double zoom2 = (double)desiredH / previewImg->get_height();
@@ -223,7 +225,7 @@ Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int desiredW, int desir
previewImg->scale (resPixbuf, 0, 0, previewImg->get_width()*zoom, previewImg->get_height()*zoom, 0, 0, zoom, zoom, Gdk::INTERP_NEAREST);
zoom_ = zoom / previewScale;
}
previewImgMutex.unlock ();
return resPixbuf;
}