diff widgets/ImageDialog.cpp @ 706:97ea68f62c1f imaf_enc

Merge from default branch
author Chris Cannam
date Thu, 05 Dec 2013 09:47:02 +0000
parents 1a0dfcbffaf1
children c8a6fd3f9dff
line wrap: on
line diff
--- a/widgets/ImageDialog.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/widgets/ImageDialog.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -204,7 +204,7 @@
             }
         }
         
-//        std::cerr << "image filename: \"" << fileName << "\"" << std::endl;
+//        cerr << "image filename: \"" << fileName << "\"" << endl;
 
         m_loadedImage = QPixmap(fileName);
         m_loadedImageFile = img;