missed some NOMINMAX

PDAL · Apr 4, 2019 · 468e1d4 · 468e1d4
1 parent 2d574d6
commit 468e1d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/io/private/pubgeo/Image.h b/io/private/pubgeo/Image.h
@@ -103,7 +103,7 @@ namespace pubgeo {
             // TODO: Double check that src and dest are the same size
 
             std::vector<std::thread> workers;
-            unsigned int N = std::min(std::thread::hardware_concurrency(),src->height);
+            unsigned int N = (std::min)(std::thread::hardware_concurrency(),src->height);
             for (unsigned int k = 0; k < N; ++k) {
                 workers.push_back(std::thread([=](){
 

diff --git a/io/private/pubgeo/shr3d.cpp b/io/private/pubgeo/shr3d.cpp
@@ -335,7 +335,7 @@ void Shr3dder::createIntensity() {
         }
 
         // Divide & copy
-        double scale = std::numeric_limits<unsigned short>::max() / max_i;
+        double scale = (std::numeric_limits<unsigned short>::max)() / max_i;
         for (unsigned int y = 0; y < intImage.height; ++y) {
             for (unsigned int x = 0; x < intImage.width; ++x) {
                 intImage.data[y][x] = (unsigned short) (scale * sumImage.data[y][x] / cntImage.data[y][x]);