From: nds <nds@opencascade.com>
Date: Tue, 25 Jun 2019 23:28:56 +0000 (+0300)
Subject: 0030268: Inspectors - improvements in VInspector plugin, 0030655: - compilation corre... 
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=c2bdcaa4534935117e187c7e755b5ae3dcab6952;p=occt-copy.git

0030268: Inspectors - improvements in VInspector plugin, 0030655: - compilation correction

compilation for checked UseFreeImage state in CMake. The patch is not necessary after porting branch to master.
---

diff --git a/src/BVH/BVH_DistanceField.lxx b/src/BVH/BVH_DistanceField.lxx
index c7280c62a7..6f7b02eb27 100644
--- a/src/BVH/BVH_DistanceField.lxx
+++ b/src/BVH/BVH_DistanceField.lxx
@@ -15,6 +15,8 @@
 
 #include <BVH_Triangulation.hxx>
 
+#include <BVH_Distance.hxx>
+
 #ifdef HAVE_TBB
   // On Windows, function TryEnterCriticalSection has appeared in Windows NT
   // and is surrounded by #ifdef in MS VC++ 7.1 headers.
diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx
index f7ed44a05f..e6bf80705a 100644
--- a/src/Image/Image_AlienPixMap.cxx
+++ b/src/Image/Image_AlienPixMap.cxx
@@ -13,6 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <windows.h>
+
 #if !defined(HAVE_FREEIMAGE) && defined(_WIN32)
   #define HAVE_WINCODEC
 #endif
@@ -350,12 +352,12 @@ bool Image_AlienPixMap::InitCopy (const Image_PixMap& theCopy)
      && TopDownInc()   == theCopy.TopDownInc())
     {
       // copy with one call
-      memcpy (ChangeData(), theCopy.Data(), std::min (SizeBytes(), theCopy.SizeBytes()));
+      memcpy (ChangeData(), theCopy.Data(), min (SizeBytes(), theCopy.SizeBytes()));
       return true;
     }
 
     // copy row-by-row
-    const Standard_Size aRowSizeBytes = std::min (SizeRowBytes(), theCopy.SizeRowBytes());
+    const Standard_Size aRowSizeBytes = min (SizeRowBytes(), theCopy.SizeRowBytes());
     for (Standard_Size aRow = 0; aRow < myData.SizeY; ++aRow)
     {
       memcpy (ChangeRow (aRow), theCopy.Row (aRow), aRowSizeBytes);