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

Merge from default branch

--- a/layer/SliceLayer.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/layer/SliceLayer.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -57,8 +57,8 @@
         dynamic_cast<const DenseThreeDimensionalModel *>(model);
 
     if (model && !sliceable) {
-        std::cerr << "WARNING: SliceLayer::setSliceableModel(" << model
-                  << "): model is not a DenseThreeDimensionalModel" << std::endl;
+        cerr << "WARNING: SliceLayer::setSliceableModel(" << model
+                  << "): model is not a DenseThreeDimensionalModel" << endl;
     }
 
     if (m_sliceableModel == sliceable) return;
@@ -360,7 +360,7 @@
     size_t f1 = v->getFrameForX(f0x + 1);
     if (f1 > f0) --f1;
 
-//    std::cerr << "centre frame " << v->getCentreFrame() << ", x " << f0x << ", f0 " << f0 << ", f1 " << f1 << std::endl;
+//    cerr << "centre frame " << v->getCentreFrame() << ", x " << f0x << ", f0 " << f0 << ", f1 " << f1 << endl;
 
     size_t res = m_sliceableModel->getResolution();
     size_t col0 = f0 / res;
@@ -369,7 +369,7 @@
     f0 = col0 * res;
     f1 = (col1 + 1) * res - 1;
 
-//    std::cerr << "resolution " << res << ", col0 " << col0 << ", col1 " << col1 << ", f0 " << f0 << ", f1 " << f1 << std::endl;
+//    cerr << "resolution " << res << ", col0 " << col0 << ", col1 " << col1 << ", f0 " << f0 << ", f1 " << f1 << endl;
 
     m_currentf0 = f0;
     m_currentf1 = f1;
@@ -622,7 +622,7 @@
 	*max = 50;
         *deflt = 0;
 
-        std::cerr << "gain is " << m_gain << ", mode is " << m_samplingMode << std::endl;
+        cerr << "gain is " << m_gain << ", mode is " << m_samplingMode << endl;
 
 	val = lrint(log10(m_gain) * 20.0);
 	if (val < *min) val = *min;