-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index 82b3d23..fb88873 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp | |||
@@ -176,26 +176,32 @@ void SlaveReciever::slotImageInfo() { | |||
176 | } | 176 | } |
177 | 177 | ||
178 | void SlaveReciever::slotThumbNail() { | 178 | void SlaveReciever::slotThumbNail() { |
179 | PixmapInfo inf = m_inPix.first(); | 179 | PixmapInfo inf = m_inPix.first(); |
180 | m_inPix.remove( inf ); | 180 | m_inPix.remove( inf ); |
181 | 181 | ||
182 | static SlaveObjects::Iterator it; | 182 | static SlaveObjects::Iterator it; |
183 | static SlaveObjects* map = slaveObjects(); // SlaveMap won't be changed during execution!!! | 183 | static SlaveObjects* map = slaveObjects(); // SlaveMap won't be changed during execution!!! |
184 | for(it = map->begin(); it != map->end(); ++it ) { | 184 | for(it = map->begin(); it != map->end(); ++it ) { |
185 | SlaveInterface* iface = it.data(); | 185 | SlaveInterface* iface = it.data(); |
186 | if( iface->supports(inf.file ) ) { | 186 | if( iface->supports(inf.file ) ) { |
187 | /* pixmap */ | 187 | /* pixmap */ |
188 | owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; | 188 | owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; |
189 | inf.pixmap = iface->pixmap(inf.file, 64, 64); | 189 | if (inf.width>256||inf.height>256) { |
190 | owarn << "Scaling thumbnail to 64x64 'cause " << inf.width<<"x"<<inf.height<< | ||
191 | " may be nonsense"; | ||
192 | inf.pixmap = iface->pixmap(inf.file, 64, 64); | ||
193 | }else { | ||
194 | inf.pixmap = iface->pixmap(inf.file, inf.width, inf.height); | ||
195 | } | ||
190 | m_outPix.append( inf ); | 196 | m_outPix.append( inf ); |
191 | break; | 197 | break; |
192 | } | 198 | } |
193 | } | 199 | } |
194 | 200 | ||
195 | 201 | ||
196 | 202 | ||
197 | if(m_inPix.isEmpty() ) | 203 | if(m_inPix.isEmpty() ) |
198 | m_pix->stop(); | 204 | m_pix->stop(); |
199 | if(!m_out->isActive() && !m_outPix.isEmpty() ) | 205 | if(!m_out->isActive() && !m_outPix.isEmpty() ) |
200 | m_out->start(100); | 206 | m_out->start(100); |
201 | } | 207 | } |