diff layer/SingleColourLayer.cpp @ 706:97ea68f62c1f imaf_enc

Merge from default branch

--- a/layer/SingleColourLayer.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/layer/SingleColourLayer.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -161,11 +161,11 @@
         // a virtual function
         hint = getDefaultColourHint(dark, impose);
 #ifdef DEBUG_COLOUR_SELECTION
-        std::cerr << "hint = " << hint << ", impose = " << impose << std::endl;
+        cerr << "hint = " << hint << ", impose = " << impose << endl;
 #endif
     } else {
 #ifdef DEBUG_COLOUR_SELECTION
-        std::cerr << "(from ctor)" << std::endl;
+        cerr << "(from ctor)" << endl;
 #endif
     }
 
@@ -188,19 +188,19 @@
         }
 
 #ifdef DEBUG_COLOUR_SELECTION
-        std::cerr << "index = " << index << ", count = " << count;
+        cerr << "index = " << index << ", count = " << count;
 #endif
 
         if (bestColour < 0 || count < bestCount) {
             bestColour = index;
             bestCount = count;
 #ifdef DEBUG_COLOUR_SELECTION
-            std::cerr << " *";
+            cerr << " *";
 #endif
         }
 
 #ifdef DEBUG_COLOUR_SELECTION
-        std::cerr << std::endl;
+        cerr << endl;
 #endif
     }