From: <har...@us...> - 2009-01-25 19:59:39
|
Revision: 3593 http://hugin.svn.sourceforge.net/hugin/?rev=3593&view=rev Author: harryvanderwolf Date: 2009-01-25 19:59:33 +0000 (Sun, 25 Jan 2009) Log Message: ----------- outcommented a lot of cout messages as they overflow the system log Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/ImageCache.cpp Modified: hugin/trunk/src/hugin1/base_wx/ImageCache.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/ImageCache.cpp 2009-01-25 15:16:17 UTC (rev 3592) +++ hugin/trunk/src/hugin1/base_wx/ImageCache.cpp 2009-01-25 19:59:33 UTC (rev 3593) @@ -210,23 +210,23 @@ std::map<std::string, EntryPtr>::iterator imgIt; for(imgIt=images.begin(); imgIt != images.end(); imgIt++) { - cout << "Image: " << imgIt->first << std::endl; - cout << "CacheEntry: " << imgIt->second.use_count() << "last access: " << imgIt->second->lastAccess; + //cout << "Image: " << imgIt->first << std::endl; + //cout << "CacheEntry: " << imgIt->second.use_count() << "last access: " << imgIt->second->lastAccess; if (imgIt->second->image8) { imgMem += imgIt->second->image8->width() * imgIt->second->image8->height() * 3; - cout << " 8bit: " << imgIt->second->image8.use_count(); + //cout << " 8bit: " << imgIt->second->image8.use_count(); } if (imgIt->second->image16) { imgMem += imgIt->second->image16->width() * imgIt->second->image16->height() * 3*2; - cout << " 16bit: " << imgIt->second->image8.use_count(); + //cout << " 16bit: " << imgIt->second->image8.use_count(); } if (imgIt->second->imageFloat) { imgMem += imgIt->second->imageFloat->width() * imgIt->second->imageFloat->height() * 3 * 4; - cout << " float: " << imgIt->second->imageFloat.use_count() ; + //cout << " float: " << imgIt->second->imageFloat.use_count() ; } if (imgIt->second->mask) { imgMem += imgIt->second->mask->width() * imgIt->second->mask->height(); - cout << " mask: " << imgIt->second->mask.use_count() << std:: endl; + //cout << " mask: " << imgIt->second->mask.use_count() << std:: endl; } } @@ -306,7 +306,7 @@ // purgedMem>>20, (usedMem - purgedMem)>>20 // ).c_str(),0); DEBUG_DEBUG("purged: " << (purgedMem>>20) << " MB, memory used for images: " << ((usedMem - purgedMem)>>20) << " MB"); - cout << "purged: " << (purgedMem>>20) << " MB, memory used for images: " << ((usedMem - purgedMem)>>20) << " MB" << endl; + //cout << "purged: " << (purgedMem>>20) << " MB, memory used for images: " << ((usedMem - purgedMem)>>20) << " MB" << endl; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-11 12:10:41
|
Revision: 4601 http://hugin.svn.sourceforge.net/hugin/?rev=4601&view=rev Author: stativ Date: 2009-10-11 12:10:34 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Fixed minor memory leak Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/ImageCache.cpp Modified: hugin/trunk/src/hugin1/base_wx/ImageCache.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/ImageCache.cpp 2009-10-11 12:08:03 UTC (rev 4600) +++ hugin/trunk/src/hugin1/base_wx/ImageCache.cpp 2009-10-11 12:10:34 UTC (rev 4601) @@ -935,6 +935,7 @@ if (iopts.m_vigCorrMode & ImageOptions::VIGCORR_FLATFIELD) { ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(iopts.m_flatfield.c_str()); if (!e) { + delete remapped; throw std::runtime_error("could not retrieve flatfield image for preview generation"); } if (e->image8->width()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |