Merge branch 'master' into extras_property_callback

code/Common/Assimp.cpp

@@ -1079,7 +1079,7 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
         const C_STRUCT aiMatrix4x4 *mat,
         C_STRUCT aiVector3D *scaling,
         C_STRUCT aiVector3D *axis,
-        float *angle,
+        ai_real *angle,
         C_STRUCT aiVector3D *position) {
     ai_assert(nullptr != mat);
     ai_assert(nullptr != scaling);

code/Common/Exporter.cpp

@@ -74,8 +74,8 @@ Here we implement only the C++ interface (Assimp::Exporter).
 
 namespace Assimp {
 
-#ifdef _WIN32
-#    pragma warning( disable : 4800 ) 
+#if _MSC_VER > 1920
+#    pragma warning( disable : 4800 )
 #endif // _WIN32
 
 

code/Common/SpatialSort.cpp

@@ -208,13 +208,14 @@ BinFloat ToBinary(const ai_real &pValue) {
     // floating-point numbers are of sign-magnitude format, so find out what signed number
     //  representation we must convert negative values to.
     // See http://en.wikipedia.org/wiki/Signed_number_representations.
+    const BinFloat mask = BinFloat(1) << (CHAR_BIT * sizeof(BinFloat) - 1);
 
     // Two's complement?
-    const bool DefaultValue = ((-42 == (~42 + 1)) && (binValue & 0x80000000));
-    const bool OneComplement = ((-42 == ~42) && (binValue & 0x80000000));
+    const bool DefaultValue = ((-42 == (~42 + 1)) && (binValue & mask));
+    const bool OneComplement = ((-42 == ~42) && (binValue & mask));
 
     if (DefaultValue)
-        return BinFloat(1 << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue;
+        return mask - binValue;
     // One's complement?
     else if (OneComplement)
         return BinFloat(-0) - binValue;

code/Common/Subdivision.cpp

@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 void mydummy() {}
 
-#ifdef _WIN32
+#if _MSC_VER > 1920
 #pragma warning(disable : 4709)
 #endif // _WIN32
 // ------------------------------------------------------------------------------------------------