Mercurial > hg > svgui
comparison widgets/ImageDialog.cpp @ 586:1ae54a29e59e
Merge from debug-output branch
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 14:48:29 +0100 |
parents | 1fe7951a61e8 |
children | 1a0dfcbffaf1 |
comparison
equal
deleted
inserted
replaced
583:4c484636d5ec | 586:1ae54a29e59e |
---|---|
202 fileName = m_remoteFile->getLocalFilename(); | 202 fileName = m_remoteFile->getLocalFilename(); |
203 } | 203 } |
204 } | 204 } |
205 } | 205 } |
206 | 206 |
207 // std::cerr << "image filename: \"" << fileName.toStdString() << "\"" << std::endl; | 207 // std::cerr << "image filename: \"" << fileName << "\"" << std::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 |