r16572 by jghali - #9922: crashes on jpeg file import with "Exception Access Violation" error

[scribus-commit]

Author: jghali
Date: Mon Apr 11 21:24:31 2011
New Revision: 16572

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16572
Log:
#9922: crashes on jpeg file import with "Exception Access Violation" error

Modified:
    trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.cpp

Modified: trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16572&path=/trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.cpp (original)
+++ trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.cpp Mon Apr 11 21:24:31 2011
@@ -345,8 +345,9 @@
 		catch (lcmsException& e)
 		{
 			std::cerr << e.what() << std::endl;
-			if (transform.isNull() && hTransform)
-				cmsDeleteTransform(hTransform);
+			// #9922 : no idea why that crash in release mode
+			/*if (transform.isNull() && hTransform)
+				cmsDeleteTransform(hTransform);*/
 			transform = ScColorTransform();
 		}
 		cmsSetErrorHandler(NULL);
@@ -426,8 +427,9 @@
 			catch (lcmsException& e)
 			{
 				std::cerr << e.what() << std::endl;
-				if (transform.isNull() && hTransform)
-					cmsDeleteTransform(hTransform);
+				// #9922 : no idea why that crash in release mode
+				/*if (transform.isNull() && hTransform)
+					cmsDeleteTransform(hTransform);*/
 				transform = ScColorTransform();
 			}
 			cmsSetErrorHandler(NULL);
@@ -472,8 +474,9 @@
 			catch (lcmsException& e)
 			{
 				std::cerr << e.what() << std::endl;
-				if (transform.isNull() && hTransform)
-					cmsDeleteTransform(hTransform);
+				// #9922 : no idea why that crash in release mode
+				/*if (transform.isNull() && hTransform)
+					cmsDeleteTransform(hTransform);*/
 				transform = ScColorTransform();
 			}
 			cmsSetErrorHandler(NULL);