浏览代码

Merge pull request #2171 from matt77hias/C4244

Fix: C4244 conversion warning
Kim Kulling 7 年之前
父节点
当前提交
07e22fd3fc
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      code/D3MFImporter.cpp

+ 4 - 4
code/D3MFImporter.cpp

@@ -314,20 +314,20 @@ private:
         ++buf;
         ++buf;
         comp[ 1 ] = *buf;
         comp[ 1 ] = *buf;
         ++buf;
         ++buf;
-        diffuse.r = static_cast<ai_real>( strtol( comp, NULL, 16 ) ) / 255.0;
+        diffuse.r = static_cast<ai_real>( strtol( comp, NULL, 16 ) ) / ai_real(255.0);
 
 
 
 
         comp[ 0 ] = *buf;
         comp[ 0 ] = *buf;
         ++buf;
         ++buf;
         comp[ 1 ] = *buf;
         comp[ 1 ] = *buf;
         ++buf;
         ++buf;
-        diffuse.g = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / 255.0;
+        diffuse.g = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / ai_real(255.0);
 
 
         comp[ 0 ] = *buf;
         comp[ 0 ] = *buf;
         ++buf;
         ++buf;
         comp[ 1 ] = *buf;
         comp[ 1 ] = *buf;
         ++buf;
         ++buf;
-        diffuse.b = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / 255.0;
+        diffuse.b = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / ai_real(255.0);
 
 
         if(7 == len)
         if(7 == len)
             return true;
             return true;
@@ -335,7 +335,7 @@ private:
         ++buf;
         ++buf;
         comp[ 1 ] = *buf;
         comp[ 1 ] = *buf;
         ++buf;
         ++buf;
-        diffuse.a = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / 255.0;
+        diffuse.a = static_cast< ai_real >( strtol( comp, NULL, 16 ) ) / ai_real(255.0);
 
 
         return true;
         return true;
     }
     }