[Opde-commits] SF.net SVN: opde:[781] trunk/src/main/CustomImageCodec.cpp

[<vo...@us...>]

Revision: 781
          http://opde.svn.sourceforge.net/opde/?rev=781&view=rev
Author:   volca
Date:     2008-08-20 18:10:42 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
rather small bugfix - do not blindly expect there was an original codec in the first place

Modified Paths:
--------------
    trunk/src/main/CustomImageCodec.cpp

Modified: trunk/src/main/CustomImageCodec.cpp
===================================================================
--- trunk/src/main/CustomImageCodec.cpp	2008-08-20 18:09:24 UTC (rev 780)
+++ trunk/src/main/CustomImageCodec.cpp	2008-08-20 18:10:42 UTC (rev 781)
@@ -99,7 +99,8 @@
 		
 		// Loop no. 1 : Replace the codecs back to thei're originals
 		for (CodecList::iterator it = msReplacedCodecs.begin(); it != msReplacedCodecs.end(); ++it) {
-			Codec::registerCodec(it->second);
+			if (it->second) // only re-register if there was an original in the first place
+                Codec::registerCodec(it->second);
 		}
 
 		
@@ -193,7 +194,7 @@
 				for (size_t x = 0; x < imgData->width; ++x) {
 					uchar pidx = pSrc[x];
 						
-					if (pidx == _TRANSPARENT_PAL_INDEX)  {
+					if (pidx == _TRANSPARENT_PAL_INDEX) {
 						*(pDstRow++) = 0; // Absolutely transparent black
 						*(pDstRow++) = 0; // This is to avoid pink edges
 						*(pDstRow++) = 0;
@@ -228,7 +229,7 @@
 			
 			CodecList::iterator it = msReplacedCodecs.find(getType());
 			
-			if (it != msReplacedCodecs.end()) {
+			if (it != msReplacedCodecs.end() && (it->second)) {
 				return it->second->decode(input);
 			} else {
 				OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR, "CustomImageCodec does not support other formats than FIT_BITMAP, and no underlying Codec found for type " 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.