[mapguide-commits] r9308 - in sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src: . dwfcore/ansi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-10 07:00:49 -0800 (Wed, 10 Jan 2018)
New Revision: 9308

Modified:
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp
Log:
DWF Toolkit fixes. Don't define DEBUG in debug mode (autotools didn't) and fix new/delete mismatch as reported by ASAN

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt	2018-01-10 12:36:54 UTC (rev 9307)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt	2018-01-10 15:00:49 UTC (rev 9308)
@@ -81,6 +81,9 @@
 # DWFCore, but DWFToolkit and downstream dependencies
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+# Autotools does not define these in debug, and neither shall we
+remove_definitions(-DDEBUG -D_DEBUG)
+
 set (DWF_VERSION_MAJOR 7)
 set (DWF_VERSION_MINOR 7)
 set (DWF_VERSION_REV 0)

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp	2018-01-10 12:36:54 UTC (rev 9307)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/String.cpp	2018-01-10 15:00:49 UTC (rev 9308)
@@ -81,7 +81,7 @@
 		pNext = pNext->_next;
 		if(pLast->_buffer != NULL)
 		{
-			DWFCORE_FREE_OBJECT( pLast->_buffer );
+			DWFCORE_FREE_MEMORY( pLast->_buffer );
 		}
 		DWFCORE_FREE_OBJECT( pLast );
 	}