From cd7d080fbde57923d69eef48574ac877684deab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 26 Jan 2020 18:00:59 +0100 Subject: [PATCH] Test that there is no dependency of Image headers on StridedArrayView. Well. BOOM. --- src/Magnum/Test/ImageTest.cpp | 7 +++++-- src/Magnum/Test/ImageViewTest.cpp | 7 +++++-- src/Magnum/Trade/Test/ImageDataTest.cpp | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index 8891674a8..640f9951a 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -23,15 +23,18 @@ DEALINGS IN THE SOFTWARE. */ +/* Included as first to check that we *really* don't need the StridedArrayView + header for definition of pixels() */ +#include "Magnum/Image.h" + #include #include #include #include -#include "Magnum/Image.h" #include "Magnum/ImageView.h" -#include "Magnum/Math/Color.h" #include "Magnum/PixelFormat.h" +#include "Magnum/Math/Color.h" namespace Magnum { namespace Test { namespace { diff --git a/src/Magnum/Test/ImageViewTest.cpp b/src/Magnum/Test/ImageViewTest.cpp index 597e433cf..e9a7880de 100644 --- a/src/Magnum/Test/ImageViewTest.cpp +++ b/src/Magnum/Test/ImageViewTest.cpp @@ -23,14 +23,17 @@ DEALINGS IN THE SOFTWARE. */ +/* Included as first to check that we *really* don't need the StridedArrayView + header for definition of pixels() */ +#include "Magnum/ImageView.h" + #include #include #include #include -#include "Magnum/Math/Color.h" -#include "Magnum/ImageView.h" #include "Magnum/PixelFormat.h" +#include "Magnum/Math/Color.h" namespace Magnum { namespace Test { namespace { diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index 0248a63e4..4662288e0 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -23,15 +23,18 @@ DEALINGS IN THE SOFTWARE. */ +/* Included as first to check that we *really* don't need the StridedArrayView + header for definition of pixels() */ +#include "Magnum/Trade/ImageData.h" + #include #include #include #include #include "Magnum/ImageView.h" -#include "Magnum/Math/Color.h" #include "Magnum/PixelFormat.h" -#include "Magnum/Trade/ImageData.h" +#include "Magnum/Math/Color.h" namespace Magnum { namespace Trade { namespace Test { namespace {