From bff0fa58a53648602663ee3238573642b7ae927d Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Wed, 5 Jan 2011 21:55:36 +0100
Subject: [PATCH] Other printf under if

---
 rtengine/hlmultipliers.cc | 9 ++++++---
 rtengine/hlrecovery.cc    | 4 ++--
 rtengine/iccstore.cc      | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rtengine/hlmultipliers.cc b/rtengine/hlmultipliers.cc
index 5f3271baa..57a455d6c 100644
--- a/rtengine/hlmultipliers.cc
+++ b/rtengine/hlmultipliers.cc
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <rawimagesource.h>
 #include <rawimagesource_i.h>
+#include <options.h>
 
 #define MAXVAL  0xffff
 #define CLIP(a) ((a)>0?((a)<MAXVAL?(a):MAXVAL):0)
@@ -194,15 +195,17 @@ void hlmultipliers (int** rec[3], int max[3], int dh, int dw) {
                 }
         if (!change && phase<4) {
             phase++;
-            printf ("phc %d: %d\n", phase, k);
+            if( options.rtSettings.verbose )
+               printf ("phc %d: %d\n", phase, k);
         }
         else if (!change) 
             break;
             
-        if (k%20 == 0)
+        if (k%20 == 0 && options.rtSettings.verbose )
             printf ("changed %d\n", changed);
     }
-    printf ("Highlight recovery ends in %d iterations\n", k);
+    if( options.rtSettings.verbose )
+       printf ("Highlight recovery ends in %d iterations\n", k);
 
     int maxval = MAX(MAX(max[0], max[1]), max[2]);    
     for (int i=0; i<dh; i++)
diff --git a/rtengine/hlrecovery.cc b/rtengine/hlrecovery.cc
index c844b425b..4228e224d 100644
--- a/rtengine/hlrecovery.cc
+++ b/rtengine/hlrecovery.cc
@@ -51,8 +51,8 @@ void RawImageSource::updateHLRecoveryMap (bool needred, bool needgreen, bool nee
     max[0] = maxr;
     max[1] = maxg;
     max[2] = maxb;
-    
-    printf ("Maximum: R: %d, G: %d, B: %d\n", maxr, maxg, maxb);
+    if( options.rtSettings.verbose )
+       printf ("HLRecoveryMap Maximum: R: %d, G: %d, B: %d\n", maxr, maxg, maxb);
 
     // downscale image
     int dw = W/SCALE;
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index f5e96f713..331c2ea2c 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -24,6 +24,7 @@
 #endif
 #include <iccmatrices.h>
 #include <glib/gstdio.h>
+#include <options.h>
 
 namespace rtengine {
 
@@ -186,7 +187,8 @@ std::vector<std::string> ICCStore::parseDir (Glib::ustring pdir) {
             if (!Glib::file_test (fname, Glib::FILE_TEST_IS_DIR)) {
                 int lastdot = sname.find_last_of ('.');
                 if (lastdot!=Glib::ustring::npos && lastdot<=(int)sname.size()-4 && (!sname.casefold().compare (lastdot, 4, ".icm") || !sname.casefold().compare (lastdot, 4, ".icc"))) {
-//                    printf ("processing file %s...\n", fname.c_str());
+                	if( options.rtSettings.verbose )
+                       printf ("Processing ICC file: %s...\n", fname.c_str());
                     Glib::ustring name = sname.substr(0,lastdot);
                     ProfileContent pc (fname);
                     if (pc.data) {