From e7fd8a8979d733f58509b372ee55f85d89aead1d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 30 Aug 2022 21:05:51 +0200
Subject: [PATCH] Fix visual studio (vs c++) bugs

---
 Image/Thresholding.h |  8 +++++---
 Utils/FileUtils.h    | 17 +++++++++++++----
 Utils/MathUtils.h    | 42 +++++++++++++++++++++++++-----------------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/Image/Thresholding.h b/Image/Thresholding.h
index 207e1dc..0b9e6f5 100644
--- a/Image/Thresholding.h
+++ b/Image/Thresholding.h
@@ -27,7 +27,7 @@ namespace Image {
                 cv::Size dim = in.size();
                 cv::Mat out(dim, in.type());
 
-                float intImg[dim.width][dim.height];
+                float *intImg = (float *) malloc(dim.width * dim.height * sizeof(float));
                 float sum;
 
                 cv::Vec3b bgr;
@@ -38,7 +38,7 @@ namespace Image {
                         bgr  = in.at<cv::Vec3b>(j, i);
                         sum += Image::ImageUtils::lightnessFromRgb(bgr[2], bgr[1], bgr[0]);
 
-                        intImg[i][j] = i == 0 ? sum : intImg[i - 1][j] + sum;
+                        intImg[i * j] = i == 0 ? sum : intImg[(i - 1) * j] + sum;
                     }
                 }
 
@@ -60,7 +60,7 @@ namespace Image {
                         y2 = oms_min(j + s / 2.0, dim.height - 1);
 
                         count = (x2 - x1) * (y2 - y1);
-                        sum   = intImg[x2][y2] - intImg[x2][y1 - 1] - intImg[x1 - 1][y2] + intImg[x1 - 1][y1 - 1];
+                        sum   = intImg[x2 * y2] - intImg[x2 * (y1 - 1)] - intImg[(x1 - 1) * y2] + intImg[(x1 - 1) * (y1 - 1)];
 
                         bgr = in.at<cv::Vec3b>(j, i);
                         brightness = Image::ImageUtils::lightnessFromRgb(bgr[2], bgr[1], bgr[0]);
@@ -73,6 +73,8 @@ namespace Image {
                     }
                 }
 
+                free(intImg);
+
                 return out;
             }
     };
diff --git a/Utils/FileUtils.h b/Utils/FileUtils.h
index 01024b8..ee8a4f4 100644
--- a/Utils/FileUtils.h
+++ b/Utils/FileUtils.h
@@ -11,10 +11,15 @@
 #define UTILS_FILE_UTILS_H
 
 #ifdef _WIN32
-#include <unistd.h>
-#include <stdbool.h>
+    #ifdef _MSC_VER
+        #include <io.h>
+    #else
+        #include <unistd.h>
+    #endif
+
+    #include <stdbool.h>
 #elif defined __linux__
-#include <sys/stat.h>
+    #include <sys/stat.h>
 #endif
 
 namespace Utils {
@@ -26,7 +31,11 @@ namespace Utils {
             bool file_exists (char *filename)
             {
                 #ifdef _WIN32
-                    return access(filename, F_OK) == 0;
+                    #ifdef _MSC_VER
+                        return _access_s(filename, 0) == 0;
+                    #else
+                        return access(filename, 0) == 0;
+                    #endif
                 #elif defined __linux__
                     struct stat buffer;
                     return stat(filename, &buffer) == 0;
diff --git a/Utils/MathUtils.h b/Utils/MathUtils.h
index f61ea59..30bbd09 100644
--- a/Utils/MathUtils.h
+++ b/Utils/MathUtils.h
@@ -12,26 +12,34 @@
 
 #define OMS_PI 3.14159265358979323846
 
-#define oms_max(a, b) \
-    ({ __typeof__ (a) _a = (a); \
-        __typeof__ (b) _b = (b); \
-        _a > _b ? _a : _b; })
+#ifdef _MSC_VER
+    #define oms_max(a, b) ((a) > (b) ? (a) : (b))
+    #define oms_min(a, b) ((a) > (b) ? (b) : (a))
+    #define oms_abs(a) ((a) > 0 ? (a) : -(a))
+    #define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0)
+    #define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI)
+#else
+    #define oms_max(a, b) \
+        ( __typeof__(a) _a = (a); \
+            __typeof__(b) _b = (b); \
+            _a > _b ? _a : _b; )
 
-#define oms_min(a, b) \
-    ({ __typeof__ (a) _a = (a); \
-        __typeof__ (b) _b = (b); \
-        _a < _b ? _a : _b; })
+    #define oms_min(a, b) \
+        ( __typeof__(a) _a = (a); \
+            __typeof__(b) _b = (b); \
+            _a < _b ? _a : _b; )
 
-#define oms_abs(a) \
-    ({ __typeof__ (a) _a = (a); \
-        _a > 0 ? _a : -_a; })
+    #define oms_abs(a) \
+        ( __typeof__(a) _a = (a); \
+            _a > 0 ? _a : -_a; )
 
-#define oms_deg2rad(angle) \
-    ({ __typeof__ (angle) _angle = (angle); \
-        (_angle) * OMS_PI / 180.0; })
+    #define oms_deg2rad(angle) \
+        ( __typeof__(angle) _angle = (angle); \
+            (_angle) * OMS_PI / 180.0; )
 
-#define oms_rad2deg(angle) \
-    ({ __typeof__ (angle) _angle = (angle); \
-        (_angle) * 180.0 / M_PI; })
+    #define oms_rad2deg(angle) \
+        ( __typeof__(angle) _angle = (angle); \
+            (_angle) * 180.0 / OMS_PI; )
+#endif
 
 #endif