diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-18 16:42:10 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-18 16:43:41 +0200 |
| commit | 1dd9d41a1d41183c5bbbcdd6dcfbc0f9ae180173 (patch) | |
| tree | aa33faa3a19337000d55ab1e113de3763b9efb5a | |
| parent | b7d111e8a669c45d2cee50ff152b47025f62ace8 (diff) | |
fix opencv debug guard on msvc
| -rw-r--r-- | anim-crop-tool/atlas.cpp | 4 | ||||
| -rw-r--r-- | anim-crop-tool/atlas.hpp | 1 | ||||
| -rw-r--r-- | anim-crop-tool/main.cpp | 5 |
3 files changed, 3 insertions, 7 deletions
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; |