From 0de51c3c3dbf680abaa696faef628ebe773edb35 Mon Sep 17 00:00:00 2001
From: engineer_apple <engineer_apple@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Sat, 22 Feb 2020 22:54:23 +0000
Subject: [PATCH] removed warning for VisualStudio 2012

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6093 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/CAnimatedMeshSceneNode.cpp       | 4 ++--
 source/Irrlicht/CImageLoaderRGB.cpp              | 2 +-
 source/Irrlicht/IBurningShader.cpp               | 9 +++++++--
 source/Irrlicht/IBurningShader.h                 | 2 ++
 source/Irrlicht/SoftwareDriver2_compile_config.h | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
index 593496a4..de96749b 100644
--- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
@@ -112,12 +112,12 @@ void CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
 		if (FramesPerSecond > 0.f) //forwards...
 		{
 			if (CurrentFrameNr > EndFrame)
-				CurrentFrameNr = StartFrame + fmod(CurrentFrameNr - StartFrame, (f32)(EndFrame-StartFrame));
+				CurrentFrameNr = StartFrame + fmodf(CurrentFrameNr - StartFrame, (f32)(EndFrame-StartFrame));
 		}
 		else //backwards...
 		{
 			if (CurrentFrameNr < StartFrame)
-				CurrentFrameNr = EndFrame - fmod(EndFrame - CurrentFrameNr, (f32)(EndFrame-StartFrame));
+				CurrentFrameNr = EndFrame - fmodf(EndFrame - CurrentFrameNr, (f32)(EndFrame-StartFrame));
 		}
 	}
 	else
diff --git a/source/Irrlicht/CImageLoaderRGB.cpp b/source/Irrlicht/CImageLoaderRGB.cpp
index 1f0b141e..dfb4b8b0 100644
--- a/source/Irrlicht/CImageLoaderRGB.cpp
+++ b/source/Irrlicht/CImageLoaderRGB.cpp
@@ -555,7 +555,7 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb
 		// limit the count value to the remaining row size
 		if (oPtr + count*rgb.Header.BPC > buf + rgb.Header.Xsize * rgb.Header.BPC)
 		{
-			count = ( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC;
+			count = (s32)( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC;
 		}
 
 		if (count<=0)
diff --git a/source/Irrlicht/IBurningShader.cpp b/source/Irrlicht/IBurningShader.cpp
index 45d6706f..a375ef38 100644
--- a/source/Irrlicht/IBurningShader.cpp
+++ b/source/Irrlicht/IBurningShader.cpp
@@ -25,7 +25,7 @@ namespace video
 		0xf0,0x70,0xd0,0x50
 	};
 
-IBurningShader::IBurningShader(CBurningVideoDriver* driver)
+void IBurningShader::constructor_IBurningShader(CBurningVideoDriver* driver)
 {
 	#ifdef _DEBUG
 	setDebugName("IBurningShader");
@@ -61,6 +61,11 @@ IBurningShader::IBurningShader(CBurningVideoDriver* driver)
 	TL_Flag = 0;
 }
 
+IBurningShader::IBurningShader(CBurningVideoDriver* driver)
+{
+	constructor_IBurningShader(driver);
+}
+
 //! Constructor
 IBurningShader::IBurningShader(
 	CBurningVideoDriver* driver,
@@ -80,8 +85,8 @@ IBurningShader::IBurningShader(
 	IShaderConstantSetCallBack* callback,
 	E_MATERIAL_TYPE baseMaterial,
 	s32 userData)
-:IBurningShader(driver)
 {
+	constructor_IBurningShader(driver);
 	BaseMaterial = baseMaterial;
 	CallBack = callback;
 	if (CallBack)
diff --git a/source/Irrlicht/IBurningShader.h b/source/Irrlicht/IBurningShader.h
index 52896bc5..8a9a8180 100644
--- a/source/Irrlicht/IBurningShader.h
+++ b/source/Irrlicht/IBurningShader.h
@@ -328,6 +328,8 @@ namespace video
 
 	protected:
 
+		void constructor_IBurningShader(CBurningVideoDriver* driver);
+
 		CBurningVideoDriver *Driver;
 		IShaderConstantSetCallBack* CallBack;
 		E_MATERIAL_TYPE BaseMaterial;
diff --git a/source/Irrlicht/SoftwareDriver2_compile_config.h b/source/Irrlicht/SoftwareDriver2_compile_config.h
index 539962fa..725ba1a9 100644
--- a/source/Irrlicht/SoftwareDriver2_compile_config.h
+++ b/source/Irrlicht/SoftwareDriver2_compile_config.h
@@ -216,7 +216,7 @@ enum edge_test_flag
 #define	ipol_lower_equal_0(n)	((n) <= (ipoltype)0.0)
 #define	ipol_greater_0(n)		((n) >  (ipoltype)0.0)
 
-#if	(_MSC_VER >= 1600 )
+#if	(_MSC_VER > 1700 )
 	#define burning_restrict __restrict
 #else
 	#define burning_restrict