Re-integrate tinyxml into the source tree

src/osgEarth/CMakeLists.txt

@@ -12,7 +12,6 @@ endif()
 find_package(CURL REQUIRED)
 find_package(GDAL REQUIRED)
 find_package(SQLite3 REQUIRED)
-find_package(TinyXML REQUIRED)
 
 # optional
 find_package(geos)
@@ -93,7 +92,7 @@ configure_shaders(
     Shaders.cpp.in
     ${SHADERS_CPP}
     ${TARGET_GLSL} )
-
+    
 SET(TARGET_H    
     AGG.h
     AltitudeFilter
@@ -450,6 +449,9 @@ SET(TARGET_H
     rtree.h
     weemesh.h
     weejobs.h
+
+    tinyxml/tinyxml.h
+    tinyxml/tinystr.h
 
     ${OSGEARTH_BUILDCONFIG_HEADER}
     ${OSGEARTH_VERSION_HEADER}
@@ -806,6 +808,11 @@ set(TARGET_SRC
     XYZFeatureSource.cpp
     XYZModelLayer.cpp
 
+    tinyxml/tinyxml.cpp
+    tinyxml/tinyxmlerror.cpp
+    tinyxml/tinystr.cpp
+    tinyxml/tinyxmlparser.cpp
+
     ${SHADERS_CPP}
 )
 

src/osgEarth/XmlUtils.cpp

@@ -19,7 +19,7 @@
 
 #include <osgEarth/XmlUtils>
 
-#include "tinyxml.h"
+#include "tinyxml/tinyxml.h"
 
 
 using namespace osgEarth;
@@ -527,9 +527,12 @@ namespace
             XmlText* t = (XmlText*)node;
             std::string value = t->getValue();
 
-            std::string encodedValue;
-            TiXmlBase::EncodeString(value, &encodedValue);
-            bool needCDATA = !encodedValue.empty() && encodedValue != value;
+            //std::string encodedValue;
+            TiXmlString rawValue(value.c_str());
+            TiXmlString encodedValue;
+            TiXmlBase::EncodeString(rawValue, &encodedValue);
+
+            bool needCDATA = !encodedValue.empty() && (std::string(encodedValue.c_str()) != value);
 
             TiXmlText* tNode = new TiXmlText(value.c_str());
             if (needCDATA)

src/osgEarth/tinyxml/tinystr.cpp

@@ -0,0 +1,116 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original file by Yves Berquin.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+/*
+ * THIS FILE WAS ALTERED BY Tyge Løvset, 7. April 2005.
+ */
+
+
+#ifndef TIXML_USE_STL
+
+#include "tinystr.h"
+
+// Error value for find primitive
+const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
+
+
+// Null rep.
+TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
+
+
+void TiXmlString::reserve (size_type cap)
+{
+	if (cap > capacity())
+	{
+		TiXmlString tmp;
+		tmp.init(length(), cap);
+		memcpy(tmp.start(), data(), length());
+		swap(tmp);
+	}
+}
+
+
+TiXmlString& TiXmlString::assign(const char* str, size_type len)
+{
+	size_type cap = capacity();
+	if (len > cap || cap > 3*(len + 8))
+	{
+		TiXmlString tmp;
+		tmp.init(len);
+		memcpy(tmp.start(), str, len);
+		swap(tmp);
+	}
+	else
+	{
+		memmove(start(), str, len);
+		set_size(len);
+	}
+	return *this;
+}
+
+
+TiXmlString& TiXmlString::append(const char* str, size_type len)
+{
+	size_type newsize = length() + len;
+	if (newsize > capacity())
+	{
+		reserve (newsize + capacity());
+	}
+	memmove(finish(), str, len);
+	set_size(newsize);
+	return *this;
+}
+
+
+TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	tmp.reserve(a.length() + b.length());
+	tmp += a;
+	tmp += b;
+	return tmp;
+}
+
+TiXmlString operator + (const TiXmlString & a, const char* b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
+	tmp.reserve(a.length() + b_len);
+	tmp += a;
+	tmp.append(b, b_len);
+	return tmp;
+}
+
+TiXmlString operator + (const char* a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
+	tmp.reserve(a_len + b.length());
+	tmp.append(a, a_len);
+	tmp += b;
+	return tmp;
+}
+
+
+#endif	// TIXML_USE_STL