Test that there is no dependency of Image headers on StridedArrayView.

Well. BOOM.
mosra · Jan 26, 2020 · cd7d080 · cd7d080
1 parent 2ba54b5
commit cd7d080
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git 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 <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
-#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
@@ -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 <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
-#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
@@ -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 <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
 #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 {