author | alwin <alwin> | 2004-11-10 23:41:17 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-10 23:41:17 (UTC) |
commit | a57e46d9b290712fa1ff106a1be133f4f9751a96 (patch) (side-by-side diff) | |
tree | f590e58a0fd1adf01522f596e02ff99eef69e9fe | |
parent | 660b61a7f8b9fb885226507d7f6716ab2dcedbb8 (diff) | |
download | opie-a57e46d9b290712fa1ff106a1be133f4f9751a96.zip opie-a57e46d9b290712fa1ff106a1be133f4f9751a96.tar.gz opie-a57e46d9b290712fa1ff106a1be133f4f9751a96.tar.bz2 |
removed a lot of debug messages
-rw-r--r-- | noncore/graphics/opie-eye/slave/jpeg_slave.cpp | 3 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 11 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/thumbnailtool.cpp | 3 |
3 files changed, 4 insertions, 13 deletions
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp index 668ad13..0f41359 100644 --- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp +++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp @@ -182,14 +182,11 @@ QPixmap JpegSlave::pixmap( const QString& path, int wid, int hei) { if ( !ImageInfo.scan( path ) || ImageInfo.isNullThumbnail() ) { QImage img; QImageIO iio( path, 0l ); if (wid < ImageInfo.getWidth() || hei<ImageInfo.getHeight()) { - odebug << "Scaling "<<ImageInfo.getWidth()<<"x"<<ImageInfo.getHeight() - << " to "<<wid<<"x"<<hei<< " ("<<path<<")"<<oendl; QString str = QString( "Fast Shrink( 4 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei ); iio.setParameters( str.latin1() );// will be strdupped anyway } else { - odebug << "Not scaling "<<ImageInfo.getWidth()<<"x"<<ImageInfo.getHeight()<< " ("<<path<<")"<<oendl; } img = iio.read() ? iio.image() : QImage(); return ThumbNailTool::scaleImage( img, wid,hei ); }else{ diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index 941a5df..3b11c04 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp @@ -40,9 +40,8 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { * GUI sends no QPIxmap!!! */ QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { s >> inf.file >> inf.width >> inf.height; - owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; return s; } QDataStream &operator<<( QDataStream& s, const ImageInfo& i) { return s << i.kind << i.file << i.info; @@ -85,9 +84,8 @@ SlaveReciever::SlaveReciever( QObject* par) SlaveReciever::~SlaveReciever() { } void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { - owarn << "String is " << string.data() << "" << oendl; QDataStream stream(ar, IO_ReadOnly ); QStringList lst; static ImageInfo inf; static PixmapInfo pix; @@ -98,9 +96,8 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) m_inList.append(inf); }else if ( string == "thumbInfos(QStringList)" ) { stream >> lst; for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - owarn << "Adding thumbinfo for file "+ *it << oendl; inf.file = (*it); inf.kind = false; m_inList.append(inf); } @@ -110,9 +107,8 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) m_inList.append(inf); }else if ( string == "fullInfos(QStringList)" ) { stream >> lst; for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - owarn << "Adding fullInfo for"+ *it << oendl; inf.file = (*it); inf.kind = true; m_inList.append(inf); } @@ -122,9 +118,8 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) }else if ( string == "pixmapInfos(PixmapInfos)" ) { PixmapList list; stream >> list; for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { - owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; m_inPix.append(*it); } }else if ( string == "refUp()" ) { m_refs++; @@ -186,9 +181,8 @@ void SlaveReciever::slotThumbNail() { for(it = map->begin(); it != map->end(); ++it ) { SlaveInterface* iface = it.data(); if( iface->supports(inf.file ) ) { /* pixmap */ - owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; if (inf.width>256||inf.height>256) { owarn << "Scaling thumbnail to 64x64 'cause " << inf.width<<"x"<<inf.height<< " may be nonsense"; inf.pixmap = iface->pixmap(inf.file, 64, 64); @@ -211,26 +205,29 @@ void SlaveReciever::slotThumbNail() { void SlaveReciever::slotSend() { m_out->stop(); - owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; /* queue it and send */ /* if this ever gets a service introduce request queues * so we can differinatate between different clients */ if (! m_outPix.isEmpty() ) { QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); answer << outPix(); +#if 0 for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; } +#endif } if ( !m_outList.isEmpty() ) { QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" ); answer << outInf(); +#if 0 for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { owarn << "Sending out2 " + (*it).file << oendl; } +#endif } m_outList.clear(); m_outPix.clear(); diff --git a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp index d2e169c..62bb1e6 100644 --- a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp +++ b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp @@ -30,24 +30,21 @@ static bool makeThumbDir( const QFileInfo& inf, bool make = false) { * check for a png in /foo/bar/.opie-eye/%dx%d-imagefoo.gif */ QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) { QFileInfo inf( path ); - owarn << "Get Thumb" << oendl; if ( !makeThumbDir( inf ) ) { QPixmap pix; return pix; } QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); - owarn << inf.dirPath()+str << oendl; return QPixmap( inf.dirPath()+str,"PNG" ); } void ThumbNailTool::putThumb( const QString& path, const QPixmap& pix, int width, int height ) { QFileInfo inf( path ); makeThumbDir( inf, true ); QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); - owarn << inf.dirPath()+str << oendl; pix.save( inf.dirPath()+str, "PNG" ); } |