From dc86c6fe73584fd7165194f37c619d1773d593a4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Sep 2017 08:37:36 -0700
Subject: [PATCH] fixes for warnings in FBXReader/FBXWriter

---
 libraries/baking/CMakeLists.txt |  2 +-
 libraries/fbx/CMakeLists.txt    |  2 +-
 libraries/fbx/src/FBXReader.cpp |  6 +++---
 libraries/fbx/src/FBXWriter.cpp | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libraries/baking/CMakeLists.txt b/libraries/baking/CMakeLists.txt
index 66cf791776..2304a5e0c0 100644
--- a/libraries/baking/CMakeLists.txt
+++ b/libraries/baking/CMakeLists.txt
@@ -6,5 +6,5 @@ include_hifi_library_headers(gpu)
 
 add_dependency_external_projects(draco)
 find_package(Draco REQUIRED)
-target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
+include_directories(SYSTEM ${DRACO_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 7cead5aa4f..4c81f10302 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -6,5 +6,5 @@ include_hifi_library_headers(gpu image)
 
 add_dependency_external_projects(draco)
 find_package(Draco REQUIRED)
-target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
+include_directories(SYSTEM ${DRACO_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index d4a58a1126..e4fea00a34 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -169,7 +169,7 @@ QString getID(const QVariantList& properties, int index = 0) {
 }
 
 /// The names of the joints in the Maya HumanIK rig
-static const std::array<char*, 16> HUMANIK_JOINTS = {
+static const std::array<const char*, 16> HUMANIK_JOINTS = {{
     "RightHand",
     "RightForeArm",
     "RightArm",
@@ -186,7 +186,7 @@ static const std::array<char*, 16> HUMANIK_JOINTS = {
     "LeftLeg",
     "RightFoot",
     "LeftFoot"
-};
+}};
 
 class FBXModel {
 public:
@@ -512,7 +512,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
 
     QVector<QString> humanIKJointNames;
-    for (int i = 0; i < HUMANIK_JOINTS.size(); i++) {
+    for (int i = 0; i <  (int) HUMANIK_JOINTS.size(); i++) {
         QByteArray jointName = HUMANIK_JOINTS[i];
         humanIKJointNames.append(processID(getString(joints.value(jointName, jointName))));
     }
diff --git a/libraries/fbx/src/FBXWriter.cpp b/libraries/fbx/src/FBXWriter.cpp
index c14e383402..cc34696f92 100644
--- a/libraries/fbx/src/FBXWriter.cpp
+++ b/libraries/fbx/src/FBXWriter.cpp
@@ -143,7 +143,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                 break;
             }
 
-            // TODO Delete? Do we ever use QList instead of QVector?
+        // TODO Delete? Do we ever use QList instead of QVector?
         case QVariant::Type::List:
             {
                 auto list = prop.toList();
@@ -156,7 +156,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                         out << (int32_t)0;
                         out << (int32_t)0;
                         for (auto& innerProp : list) {
-                            out << prop.toFloat();
+                            out << innerProp.toFloat();
                         }
                         break;
 
@@ -166,7 +166,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                         out << (int32_t)0;
                         out << (int32_t)0;
                         for (auto& innerProp : list) {
-                            out << prop.toDouble();
+                            out << innerProp.toDouble();
                         }
                         break;
 
@@ -176,7 +176,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                         out << (int32_t)0;
                         out << (int32_t)0;
                         for (auto& innerProp : list) {
-                            out << prop.toLongLong();
+                            out << innerProp.toLongLong();
                         }
                         break;
 
@@ -186,7 +186,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                         out << (int32_t)0;
                         out << (int32_t)0;
                         for (auto& innerProp : list) {
-                            out << prop.toInt();
+                            out << innerProp.toInt();
                         }
                         break;
 
@@ -196,7 +196,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
                         out << (int32_t)0;
                         out << (int32_t)0;
                         for (auto& innerProp : list) {
-                            out << prop.toBool();
+                            out << innerProp.toBool();
                         }
                         break;
                 }