Mercurial > hg > svgui

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Thu, 05 Dec 2013 09:47:02 +0000
parents 1a0dfcbffaf1
children 1d526ba11a24
line wrap: on
line diff
--- a/layer/Layer.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/layer/Layer.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -106,7 +106,7 @@
 PlayParameters *
 Layer::getPlayParameters() 
 {
-//    std::cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << std::endl;
+//    cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << endl;
     const Model *model = getModel();
     if (model) {
 	return PlayParameterRepository::getInstance()->getPlayParameters(model);
@@ -257,7 +257,7 @@
         }
         long myMappedFrame = alignToReference(v, sourceFrame);
 
-//        std::cerr << "sourceFrame = " << sourceFrame << ", referenceFrame = " << referenceFrame << " (have = " << i->haveReferenceFrame() << "), myMappedFrame = " << myMappedFrame << std::endl;
+//        cerr << "sourceFrame = " << sourceFrame << ", referenceFrame = " << referenceFrame << " (have = " << i->haveReferenceFrame() << "), myMappedFrame = " << myMappedFrame << endl;
 
         if (myMappedFrame != referenceFrame) return true;
     }