Ticket #1851: clean-up-fcollada-build-with-gcc-4.8.1.patch

trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDGeometryPolygonsTools.cpp

@@ -910 +910 @@
 # pragma warning(disable : 4127) // conditional expression constant
 # pragma warning(disable : 4244) // conversion from 'const float' to 'uint8'
 #endif
-    
+
 #define INVALID_VTX_IDX     (uint16(~0)) // This value is the default (invalid) value in the vtx data map
 
     template<class VAL, bool translateValue, bool isColor>
@@ -1032 +1032 @@
 
     void RevertUniqueIndices(const FCDGeometryPolygonsInput& inPInput, FCDGeometryPolygonsInput& outPInput, const FCDGeometryIndexTranslationMap& translationMap)
     {
-        FUFail("NOT_TESTED");
+        FUFail() //NOT TESTED
         size_t tmSize = translationMap.size();
         uint32 largest = 0;
         for (FCDGeometryIndexTranslationMap::const_iterator it = translationMap.begin(), itEnd = translationMap.end(); it != itEnd; ++it)

trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDLibrary.cpp

@@ -138 +138 @@
     bool b = l1->IsEmpty(); 
     if (b) { ptr = l1->FindDaeId(emptyCharString); } 
     ptr = l1->GetEntity(23); 
-    const T* cptr = ((const FCDLibrary<T>*)l1)->GetEntity(0);
-    cptr = ptr;
+    ((const FCDLibrary<T>*)l1)->GetEntity(0);
     FCDAsset* asset = l1->GetAsset();
     asset->SetFlag(11);
 }

trunk/libraries/source/fcollada/src/FCollada/FUtils/FUDebug.cpp

@@ -6 +6 @@
     MIT License: http://www.opensource.org/licenses/mit-license.php
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "StdAfx.h"
 #include "FUDebug.h"
 #include "FULogFile.h"
@@ -70 +73 @@
 void FUDebug::DebugOutV(uint8 verbosity, const char* filename, uint32 line, const char* message, va_list& vars)
 {
     char buffer[256];
-    snprintf(buffer, 256, "[%s@%lu] ", filename, line);
+    snprintf(buffer, 256, "[%s@%" PRIu32 "] ", filename, line);
     buffer[255] = 0;
     DebugString(buffer);
 

trunk/libraries/source/fcollada/src/FCollada/FUtils/FUFileManager.cpp

@@ -93 +93 @@
 #else
     // Push on the stack the original root path
     char fullPath[MAX_PATH];
-    _getcwd(fullPath, MAX_PATH);
-    size_t length = strlen(fullPath);
-    if (length < MAX_PATH - 2 && fullPath[length-1] != '/' && fullPath[length-1] != '\\')
+    if (_getcwd(fullPath, MAX_PATH))
     {
-        fullPath[length] = '/';
-        fullPath[length + 1] = 0;
+        size_t length = strlen(fullPath);
+        if (length < MAX_PATH - 2 && fullPath[length-1] != '/' && fullPath[length-1] != '\\')
+        {
+            fullPath[length] = '/';
+            fullPath[length + 1] = 0;
+        }
+        pathStack.push_back(TO_FSTRING((const char*) fullPath));
     }
-    pathStack.push_back(TO_FSTRING((const char*) fullPath));
 #endif // __PPU__
 
     forceAbsolute = false;

trunk/libraries/source/fcollada/src/FCollada/FUtils/FUStringConversion.cpp

@@ -275 +275 @@
     FUStringBuilder fbuilder;
     const char* c = emptyCharString;
     const fchar* fc = emptyFCharString;
-    float f = FUStringConversion::ToFloat(&c);
-    f = FUStringConversion::ToFloat(&fc);
-    bool b = FUStringConversion::ToBoolean(c);
-    b = FUStringConversion::ToBoolean(fc);
-    int32 i32 = FUStringConversion::ToInt32(&c);
-    i32 = FUStringConversion::ToInt32(&fc);
-    uint32 u32 = FUStringConversion::ToUInt32(&c);
-    u32 = FUStringConversion::ToUInt32(&fc);
-    u32 = FUStringConversion::HexToUInt32(&c);
-    u32 = FUStringConversion::HexToUInt32(&fc);
+    FUStringConversion::ToFloat(&c);
+    FUStringConversion::ToFloat(&fc);
+    FUStringConversion::ToBoolean(c);
+    FUStringConversion::ToBoolean(fc);
+    FUStringConversion::ToInt32(&c);
+    FUStringConversion::ToInt32(&fc);
+    FUStringConversion::ToUInt32(&c);
+    FUStringConversion::ToUInt32(&fc);
+    FUStringConversion::HexToUInt32(&c);
+    FUStringConversion::HexToUInt32(&fc);
     FMMatrix44 m44;
     FUStringConversion::ToMatrix(&c, m44);
     FUStringConversion::ToMatrix(&fc, m44);

trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp

@@ -418 +418 @@
     {
         fcdocument->SetFileUrl(fstring(filePath));
 
-        fm::string textBuffer;
-        const xmlChar* text = (const xmlChar*) contents;
-        if (length != 0)
-        {
-            textBuffer = fm::string((const char*)contents, length);
-            text = (const xmlChar*) textBuffer.c_str();
-        }
-
         // Parse the document into a XML tree
         FUXmlDocument daeDocument((const char*) contents, length);
         xmlNode* rootNode = daeDocument.GetRootNode();
@@ -523 +515 @@
     xmlOutputBufferPtr buf = xmlAllocOutputBuffer(NULL);
     xmlNodeDumpOutput(buf, rootNode->doc, rootNode, 0, 0, NULL);
 
-#ifdef LIBXML2_NEW_BUFFER
-    outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
-    memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
-#else
-    outData.resize(buf->buffer->use * sizeof(xmlChar));
-    memcpy(outData.begin(), buf->buffer->content, outData.size());
-#endif
+#ifdef LIBXML2_NEW_BUFFER
+    outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
+    memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
+#else
+    outData.resize(buf->buffer->use * sizeof(xmlChar));
+    memcpy(outData.begin(), buf->buffer->content, outData.size());
+#endif
 
     xmlOutputBufferClose(buf);
     daeDocument.ReleaseXmlData();