commit after merge with trunk

2010-09-09 20:26:00 -07:00
parent 84ecfe412a
commit aa77b69443
18 changed files with 394 additions and 301 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -201,7 +201,16 @@ void ImProcCoordinator::updatePreviewImage (int todo) {
    progress ("Conversion to RGB...",100*readyphase/numofphases);
    if (todo!=CROP) {
        previmg->getMutex().lock();
-        ipf.lab2rgb (nprevl, previmg);
+        try
+        {
+            ipf.lab2rgb (nprevl, previmg);
+        }
+        catch(char * str)
+        {
+           progress ("Error converting file...",0);
+            mProcessing.unlock ();
+            return;
+        }
        previmg->getMutex().unlock();
    }   
    if (!resultValid) {