Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
678:26c5f7fd4807 | 706:97ea68f62c1f |
---|---|
202 fileName = m_remoteFile->getLocalFilename(); | 202 fileName = m_remoteFile->getLocalFilename(); |
203 } | 203 } |
204 } | 204 } |
205 } | 205 } |
206 | 206 |
207 // std::cerr << "image filename: \"" << fileName << "\"" << std::endl; | 207 // cerr << "image filename: \"" << fileName << "\"" << endl; |
208 | 208 |
209 m_loadedImage = QPixmap(fileName); | 209 m_loadedImage = QPixmap(fileName); |
210 m_loadedImageFile = img; | 210 m_loadedImageFile = img; |
211 } | 211 } |
212 | 212 |