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/iplab2rgb.cc
+++ b/rtengine/iplab2rgb.cc
@@ -38,6 +38,9 @@ extern const Settings* settings;

 void ImProcFunctions::lab2rgb (LabImage* lab, Image8* image) {

+        if (chroma_scale == 0)
+            throw "Division by zero exception";
+
 	if (monitorTransform) {
 	    int ix = 0;
        short* buffer = new short [3*lab->W];