Merge branch 'master' into stackallocator-undefined-ref-fix

code/PostProcessing/LimitBoneWeightsProcess.cpp

@@ -53,7 +53,8 @@ namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-LimitBoneWeightsProcess::LimitBoneWeightsProcess() : mMaxWeights(AI_LMW_MAX_WEIGHTS) {
+LimitBoneWeightsProcess::LimitBoneWeightsProcess() :
+        mMaxWeights(AI_LMW_MAX_WEIGHTS), mRemoveEmptyBones(true) {
     // empty
 }
 

contrib/zip/src/zip.c

@@ -13,10 +13,14 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#if defined(_MSC_VER)
+/* For Visual Studio only, NOT MinGW (GCC) -- ThatOSDev */
+#pragma warning( disable : 4706 )
+#endif
+
 #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) ||              \
     defined(__MINGW32__)
-/* Win32, DOS, MSVC, MSVS */
-#pragma warning( disable : 4706 )
+/* Win32, DOS, MSVC, MSVS, MinGW(GCC for windows) */
 #include <direct.h>
 
 #define STRCLONE(STR) ((STR) ? _strdup(STR) : NULL)

include/assimp/metadata.h

@@ -113,19 +113,19 @@ struct aiMetadata;
   */
 // -------------------------------------------------------------------------------
 
-inline aiMetadataType GetAiType(bool) {
+inline aiMetadataType GetAiType(const bool &) {
     return AI_BOOL;
 }
 inline aiMetadataType GetAiType(int32_t) {
     return AI_INT32;
 }
-inline aiMetadataType GetAiType(uint64_t) {
+inline aiMetadataType GetAiType(const uint64_t &) {
     return AI_UINT64;
 }
-inline aiMetadataType GetAiType(float) {
+inline aiMetadataType GetAiType(const float &) {
     return AI_FLOAT;
 }
-inline aiMetadataType GetAiType(double) {
+inline aiMetadataType GetAiType(const double &) {
     return AI_DOUBLE;
 }
 inline aiMetadataType GetAiType(const aiString &) {
@@ -137,10 +137,10 @@ inline aiMetadataType GetAiType(const aiVector3D &) {
 inline aiMetadataType GetAiType(const aiMetadata &) {
     return AI_AIMETADATA;
 }
-inline aiMetadataType GetAiType(int64_t) {
+inline aiMetadataType GetAiType(const int64_t &) {
     return AI_INT64;
 }
-inline aiMetadataType GetAiType(uint32_t) {
+inline aiMetadataType GetAiType(const uint32_t &) {
     return AI_UINT32;
 }
 

include/assimp/postprocess.h

@@ -379,7 +379,7 @@ enum aiPostProcessSteps
      *     point primitives to separate meshes.
      *   </li>
      *   <li>Set the <tt>#AI_CONFIG_PP_SBP_REMOVE</tt> importer property to
-     *       @code aiPrimitiveType_POINTS | aiPrimitiveType_LINES
+     *       @code aiPrimitiveType_POINT | aiPrimitiveType_LINE
      *       @endcode to cause SortByPType to reject point
      *       and line meshes from the scene.
      *   </li>

port/PyAssimp/pyassimp/postprocess.py

@@ -270,7 +270,7 @@ aiProcess_SortByPType = 0x8000
 #     point primitives to separate meshes.
 #   <li>
 #   <li>Set the <tt>AI_CONFIG_PP_SBP_REMOVE<tt> option to 
-#       @code aiPrimitiveType_POINTS | aiPrimitiveType_LINES
+#       @code aiPrimitiveType_POINT | aiPrimitiveType_LINE
 #       @endcode to cause SortByPType to reject point
 #       and line meshes from the scene.
 #   <li>

port/dAssimp/assimp/postprocess.d

@@ -348,7 +348,7 @@ extern ( C ) {
        *   <li>Specify the <code>SortByPType</code> flag. This moves line and
        *      point primitives to separate meshes.</li>
        *   <li>Set the <code>AI_CONFIG_PP_SBP_REMOVE</codet> option to
-       *      <code>aiPrimitiveType_POINTS | aiPrimitiveType_LINES</code>
+       *      <code>aiPrimitiveType_POINT | aiPrimitiveType_LINE</code>
        *      to cause SortByPType to reject point and line meshes from the
        *      scene.</li>
        * </ul>

port/jassimp/jassimp/src/jassimp/AiPostProcessSteps.java

@@ -349,7 +349,7 @@ public enum AiPostProcessSteps {
      *   <li>Specify the #SortByPType flag. This moves line and point 
      *       primitives to separate meshes.
      *   <li>Set the <tt>AI_CONFIG_PP_SBP_REMOVE</tt> option to
-     *       <code>aiPrimitiveType_POINTS | aiPrimitiveType_LINES</code>
+     *       <code>aiPrimitiveType_POINT | aiPrimitiveType_LINE</code>
      *       to cause SortByPType to reject point and line meshes from the 
      *       scene.
      * </ul>

test/unit/utMetadata.cpp

@@ -242,6 +242,22 @@ TEST_F( utMetadata, copy_test ) {
         EXPECT_EQ( i32v, v );
     }
 
+    // uint32_t test
+    {
+        uint32_t v = 0;
+        bool ok = copy.Get("uint32_t", v);
+        EXPECT_TRUE(ok);
+        EXPECT_EQ( ui32, v );
+    }
+
+    // int64_t test
+    {
+        int64_t v = -1;
+        bool ok = copy.Get("int64_t", v);
+        EXPECT_TRUE(ok);
+        EXPECT_EQ( i64, v );
+    }
+
     // uint64_t test
     {
         uint64_t v = 255;
@@ -264,14 +280,14 @@ TEST_F( utMetadata, copy_test ) {
         EXPECT_EQ( dv, v );
     }
 
-    // bool test
+    // string test
     {
         aiString v;
         EXPECT_TRUE( copy.Get( "aiString", v ) );
         EXPECT_EQ( strVal, v );
     }
 
-    // bool test
+    // vector test
     {
         aiVector3D v;
         EXPECT_TRUE( copy.Get( "aiVector3D", v ) );