From 1dd9d41a1d41183c5bbbcdd6dcfbc0f9ae180173 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 18 Oct 2022 16:42:10 +0200
Subject: fix opencv debug guard on msvc

---
 anim-crop-tool/atlas.cpp | 4 +---
 anim-crop-tool/atlas.hpp | 1 -
 anim-crop-tool/main.cpp  | 5 ++---
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'anim-crop-tool')

diff --git a/anim-crop-tool/atlas.cpp b/anim-crop-tool/atlas.cpp
index dcb8b636..a48ad359 100644
--- a/anim-crop-tool/atlas.cpp
+++ b/anim-crop-tool/atlas.cpp
@@ -1,10 +1,8 @@
 #include "atlas.hpp"
 #include "serialize/anim.hpp"
-#include "compat/assert.hpp"
-
 #include <filesystem>
 #include <opencv2/imgcodecs.hpp>
-
+#include "compat/assert.hpp" // must go below opencv headers
 using namespace floormat::Serialize;
 
 void anim_atlas_row::add_entry(const anim_atlas_entry& x)
diff --git a/anim-crop-tool/atlas.hpp b/anim-crop-tool/atlas.hpp
index 32819a2e..02e7176b 100644
--- a/anim-crop-tool/atlas.hpp
+++ b/anim-crop-tool/atlas.hpp
@@ -1,5 +1,4 @@
 #pragma once
-
 #include <vector>
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>
diff --git a/anim-crop-tool/main.cpp b/anim-crop-tool/main.cpp
index 5eab52e5..11b1d165 100644
--- a/anim-crop-tool/main.cpp
+++ b/anim-crop-tool/main.cpp
@@ -3,16 +3,13 @@
 #include "serialize/json-helper.hpp"
 #include "compat/defs.hpp"
 #include "compat/sysexits.hpp"
-#include "compat/assert.hpp"
 
 #include <cerrno>
 #include <cmath>
 #include <cstring>
-
 #include <algorithm>
 #include <utility>
 #include <tuple>
-
 #include <filesystem>
 
 #include <Corrade/Utility/Arguments.h>
@@ -23,6 +20,8 @@
 #include <opencv2/imgcodecs/imgcodecs.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
+#include "compat/assert.hpp"
+
 using Corrade::Utility::Error;
 using Corrade::Utility::Debug;
 
-- 
cgit v1.2.3