De-inline Image headers, remove dependency on ImageView.

This means users have to add some more #includes on their side. Sorry
but it's for your own good :P

doc/generated/primitives.cpp

@@ -40,6 +40,7 @@
 #endif
 
 #include <Magnum/Image.h>
+#include <Magnum/ImageView.h>
 #include <Magnum/PixelFormat.h>
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Framebuffer.h>

doc/generated/shaders.cpp

@@ -39,6 +39,7 @@
 #endif
 
 #include <Magnum/Image.h>
+#include <Magnum/ImageView.h>
 #include <Magnum/PixelFormat.h>
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Framebuffer.h>

doc/snippets/Magnum.cpp

@@ -27,6 +27,7 @@
 
 #include "Magnum/Math/Color.h"
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #ifdef MAGNUM_TARGET_GL
 #include "Magnum/ResourceManager.h"

doc/snippets/MagnumDebugTools.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/PluginManager/Manager.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/DebugTools/CompareImage.h"
 #include "Magnum/Math/Color.h"

doc/snippets/MagnumGL.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/Containers/Reference.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/GL/AbstractShaderProgram.h"
 #include "Magnum/GL/Buffer.h"

doc/snippets/MagnumTrade.cpp

@@ -28,6 +28,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/FileCallback.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Animation/Player.h"
 #include "Magnum/MeshTools/Transform.h"

doc/snippets/debugtools-compareimage.cpp

@@ -29,6 +29,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/Trade/ImageData.h"
 #include "Magnum/Trade/AbstractImporter.h"
 #include "Magnum/DebugTools/CompareImage.h"

src/Magnum/CMakeLists.txt

@@ -64,7 +64,7 @@ set(Magnum_HEADERS
     visibility.h)
 
 set(Magnum_PRIVATE_HEADERS
-    Implementation/ImagePixelView.h)
+    Implementation/ImageProperties.h)
 
 # Files shared between main library and math unit test library
 set(MagnumMath_SRCS

src/Magnum/DebugTools/Screenshot.cpp

@@ -31,6 +31,7 @@
 
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/AbstractFramebuffer.h"
 #include "Magnum/GL/PixelFormat.h"
 #include "Magnum/Trade/AbstractImageConverter.h"

src/Magnum/DebugTools/Test/ForceRendererGLTest.cpp

@@ -28,6 +28,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/DebugTools/CompareImage.h"
 #include "Magnum/DebugTools/ForceRenderer.h"

src/Magnum/DebugTools/Test/ObjectRendererGLTest.cpp

@@ -28,6 +28,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/DebugTools/CompareImage.h"
 #include "Magnum/DebugTools/ObjectRenderer.h"

src/Magnum/DebugTools/Test/TextureImageGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/DebugTools/TextureImage.h"
 #include "Magnum/GL/CubeMapTexture.h"

src/Magnum/GL/AbstractTexture.cpp

@@ -30,6 +30,7 @@
 
 #include "Magnum/Array.h"
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/GL/BufferImage.h"
 #endif

src/Magnum/GL/BufferImage.cpp

@@ -26,6 +26,7 @@
 #include "BufferImage.h"
 
 #include "Magnum/GL/PixelFormat.h"
+#include "Magnum/Implementation/ImageProperties.h"
 
 namespace Magnum { namespace GL {
 
@@ -48,8 +49,27 @@ template<UnsignedInt dimensions> BufferImage<dimensions>::BufferImage(const Pixe
 
 template<UnsignedInt dimensions> BufferImage<dimensions>::BufferImage(NoCreateT) noexcept: _format{PixelFormat::RGBA}, _type{PixelType::UnsignedByte}, _buffer{NoCreate}, _dataSize{} {}
 
+template<UnsignedInt dimensions> BufferImage<dimensions>::BufferImage(BufferImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _type{std::move(other._type)}, _size{std::move(other._size)}, _buffer{std::move(other._buffer)}, _dataSize{std::move(other._dataSize)} {
+    other._size = {};
+}
+
+template<UnsignedInt dimensions> BufferImage<dimensions>& BufferImage<dimensions>::operator=(BufferImage<dimensions>&& other) noexcept {
+    using std::swap;
+    swap(_storage, other._storage);
+    swap(_format, other._format);
+    swap(_type, other._type);
+    swap(_size, other._size);
+    swap(_buffer, other._buffer);
+    swap(_dataSize, other._dataSize);
+    return *this;
+}
+
 template<UnsignedInt dimensions> UnsignedInt BufferImage<dimensions>::pixelSize() const { return GL::pixelSize(_format, _type); }
 
+template<UnsignedInt dimensions> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> BufferImage<dimensions>::dataProperties() const {
+    return Magnum::Implementation::imageDataProperties<dimensions>(*this);
+}
+
 template<UnsignedInt dimensions> void BufferImage<dimensions>::setData(const PixelStorage storage, const PixelFormat format, const PixelType type, const VectorTypeFor<dimensions, Int>& size, Containers::ArrayView<const void> const data, const BufferUsage usage) {
     _storage = storage;
     _format = format;
@@ -84,6 +104,25 @@ template<UnsignedInt dimensions> CompressedBufferImage<dimensions>::CompressedBu
 
 template<UnsignedInt dimensions> CompressedBufferImage<dimensions>::CompressedBufferImage(NoCreateT) noexcept: _format{}, _buffer{NoCreate}, _dataSize{} {}
 
+template<UnsignedInt dimensions> CompressedBufferImage<dimensions>::CompressedBufferImage(CompressedBufferImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _size{std::move(other._size)}, _buffer{std::move(other._buffer)}, _dataSize{std::move(other._dataSize)} {
+    other._size = {};
+    other._dataSize = {};
+}
+
+template<UnsignedInt dimensions> CompressedBufferImage<dimensions>& CompressedBufferImage<dimensions>::operator=(CompressedBufferImage<dimensions>&& other) noexcept {
+    using std::swap;
+    swap(_storage, other._storage);
+    swap(_format, other._format);
+    swap(_size, other._size);
+    swap(_buffer, other._buffer);
+    swap(_dataSize, other._dataSize);
+    return *this;
+}
+
+template<UnsignedInt dimensions> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> CompressedBufferImage<dimensions>::dataProperties() const {
+    return Magnum::Implementation::compressedImageDataProperties<dimensions>(*this);
+}
+
 template<UnsignedInt dimensions> void CompressedBufferImage<dimensions>::setData(const CompressedPixelStorage storage, const CompressedPixelFormat format, const VectorTypeFor<dimensions, Int>& size, const Containers::ArrayView<const void> data, const BufferUsage usage) {
     _storage = storage;
     _format = format;

src/Magnum/GL/BufferImage.h

@@ -285,9 +285,7 @@ template<UnsignedInt dimensions> class BufferImage {
          *
          * See @ref PixelStorage::dataProperties() for more information.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Magnum::Implementation::imageDataProperties<dimensions>(*this);
-        }
 
         /** @brief Currently allocated data size */
         std::size_t dataSize() const { return _dataSize; }
@@ -597,9 +595,7 @@ template<UnsignedInt dimensions> class CompressedBufferImage {
          * @requires_gl Compressed pixel storage is hardcoded in OpenGL ES and
          *      WebGL.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Magnum::Implementation::compressedImageDataProperties<dimensions>(*this);
-        }
 
         /**
          * @brief Image buffer
@@ -695,36 +691,6 @@ typedef CompressedBufferImage<2> CompressedBufferImage2D;
 /** @brief Three-dimensional compressed buffer image */
 typedef CompressedBufferImage<3> CompressedBufferImage3D;
 
-template<UnsignedInt dimensions> inline BufferImage<dimensions>::BufferImage(BufferImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _type{std::move(other._type)}, _size{std::move(other._size)}, _buffer{std::move(other._buffer)}, _dataSize{std::move(other._dataSize)} {
-    other._size = {};
-}
-
-template<UnsignedInt dimensions> inline CompressedBufferImage<dimensions>::CompressedBufferImage(CompressedBufferImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _size{std::move(other._size)}, _buffer{std::move(other._buffer)}, _dataSize{std::move(other._dataSize)} {
-    other._size = {};
-    other._dataSize = {};
-}
-
-template<UnsignedInt dimensions> inline BufferImage<dimensions>& BufferImage<dimensions>::operator=(BufferImage<dimensions>&& other) noexcept {
-    using std::swap;
-    swap(_storage, other._storage);
-    swap(_format, other._format);
-    swap(_type, other._type);
-    swap(_size, other._size);
-    swap(_buffer, other._buffer);
-    swap(_dataSize, other._dataSize);
-    return *this;
-}
-
-template<UnsignedInt dimensions> inline CompressedBufferImage<dimensions>& CompressedBufferImage<dimensions>::operator=(CompressedBufferImage<dimensions>&& other) noexcept {
-    using std::swap;
-    swap(_storage, other._storage);
-    swap(_format, other._format);
-    swap(_size, other._size);
-    swap(_buffer, other._buffer);
-    swap(_dataSize, other._dataSize);
-    return *this;
-}
-
 }}
 #else
 #error this header is not available in OpenGL ES 2.0 build

src/Magnum/GL/CubeMapTexture.cpp

@@ -26,6 +26,7 @@
 #include "CubeMapTexture.h"
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/GL/BufferImage.h"
 #endif

src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp

@@ -30,6 +30,7 @@
 #include <Corrade/Utility/Resource.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/AbstractShaderProgram.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/BufferImage.h"
 #include "Magnum/GL/CubeMapTextureArray.h"
 #include "Magnum/GL/Context.h"

src/Magnum/GL/Test/CubeMapTextureGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #ifndef MAGNUM_TARGET_GLES2

src/Magnum/GL/Test/FramebufferGLTest.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/CubeMapTexture.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/Test/PixelStorageGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/OpenGLTester.h"

src/Magnum/GL/Test/RectangleTextureGLTest.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/BufferImage.h"

src/Magnum/GL/Test/TextureArrayGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/BufferImage.h"

src/Magnum/GL/Test/TextureGLTest.cpp

@@ -26,6 +26,7 @@
 #include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #ifndef MAGNUM_TARGET_GLES2

src/Magnum/Image.cpp

@@ -25,8 +25,9 @@
 
 #include "Image.h"
 
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
-#include "Magnum/Implementation/ImagePixelView.h"
+#include "Magnum/Implementation/ImageProperties.h"
 
 namespace Magnum {
 
@@ -44,6 +45,33 @@ template<UnsignedInt dimensions> Image<dimensions>::Image(const PixelStorage sto
 
 template<UnsignedInt dimensions> Image<dimensions>::Image(const PixelStorage storage, const PixelFormat format, const UnsignedInt formatExtra, const UnsignedInt pixelSize) noexcept: _storage{storage}, _format{format}, _formatExtra{formatExtra}, _pixelSize{pixelSize}, _data{} {}
 
+template<UnsignedInt dimensions> Image<dimensions>::Image(Image<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _formatExtra{std::move(other._formatExtra)}, _pixelSize{std::move(other._pixelSize)}, _size{std::move(other._size)}, _data{std::move(other._data)} {
+    other._size = {};
+}
+
+template<UnsignedInt dimensions> Image<dimensions>& Image<dimensions>::operator=(Image<dimensions>&& other) noexcept {
+    using std::swap;
+    swap(_storage, other._storage);
+    swap(_format, other._format);
+    swap(_formatExtra, other._formatExtra);
+    swap(_pixelSize, other._pixelSize);
+    swap(_size, other._size);
+    swap(_data, other._data);
+    return *this;
+}
+
+template<UnsignedInt dimensions> Image<dimensions>::operator ImageView<dimensions, char>() {
+    return ImageView<dimensions, char>{_storage, _format, _formatExtra, _pixelSize, _size, _data};
+}
+
+template<UnsignedInt dimensions> Image<dimensions>::operator ImageView<dimensions, const char>() const {
+    return ImageView<dimensions, const char>{_storage, _format, _formatExtra, _pixelSize, _size, _data};
+}
+
+template<UnsignedInt dimensions> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> Image<dimensions>::dataProperties() const {
+    return Implementation::imageDataProperties<dimensions>(*this);
+}
+
 template<UnsignedInt dimensions> Containers::StridedArrayView<dimensions + 1, char> Image<dimensions>::pixels() {
     return Implementation::imagePixelView<dimensions, char>(*this);
 }
@@ -52,12 +80,50 @@ template<UnsignedInt dimensions> Containers::StridedArrayView<dimensions + 1, co
     return Implementation::imagePixelView<dimensions, const char>(*this);
 }
 
+template<UnsignedInt dimensions> Containers::Array<char> Image<dimensions>::release() {
+    Containers::Array<char> data{std::move(_data)};
+    _size = {};
+    return data;
+}
+
 template<UnsignedInt dimensions> CompressedImage<dimensions>::CompressedImage(const CompressedPixelStorage storage, const CompressedPixelFormat format, const VectorTypeFor<dimensions, Int>& size, Containers::Array<char>&& data) noexcept: _storage{storage}, _format{format}, _size{size}, _data{std::move(data)} {}
 
 template<UnsignedInt dimensions> CompressedImage<dimensions>::CompressedImage(const CompressedPixelStorage storage, const UnsignedInt format, const VectorTypeFor<dimensions, Int>& size, Containers::Array<char>&& data) noexcept: CompressedImage{storage, compressedPixelFormatWrap(format), size, std::move(data)} {}
 
 template<UnsignedInt dimensions> CompressedImage<dimensions>::CompressedImage(const CompressedPixelStorage storage) noexcept: _storage{storage}, _format{} {}
 
+template<UnsignedInt dimensions> CompressedImage<dimensions>::CompressedImage(CompressedImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _size{std::move(other._size)}, _data{std::move(other._data)}
+{
+    other._size = {};
+}
+
+template<UnsignedInt dimensions> CompressedImage<dimensions>& CompressedImage<dimensions>::operator=(CompressedImage<dimensions>&& other) noexcept {
+    using std::swap;
+    swap(_storage, other._storage);
+    swap(_format, other._format);
+    swap(_size, other._size);
+    swap(_data, other._data);
+    return *this;
+}
+
+template<UnsignedInt dimensions> CompressedImage<dimensions>::operator CompressedImageView<dimensions, char>() {
+    return CompressedImageView<dimensions, char>{_storage, _format, _size, _data};
+}
+
+template<UnsignedInt dimensions> CompressedImage<dimensions>::operator CompressedImageView<dimensions, const char>() const {
+    return CompressedImageView<dimensions, const char>{_storage, _format, _size, _data};
+}
+
+template<UnsignedInt dimensions> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> CompressedImage<dimensions>::dataProperties() const {
+    return Implementation::compressedImageDataProperties<dimensions>(*this);
+}
+
+template<UnsignedInt dimensions> Containers::Array<char> CompressedImage<dimensions>::release() {
+    Containers::Array<char> data{std::move(_data)};
+    _size = {};
+    return data;
+}
+
 #ifndef DOXYGEN_GENERATING_OUTPUT
 template class MAGNUM_EXPORT Image<1>;
 template class MAGNUM_EXPORT Image<2>;

src/Magnum/Image.h

@@ -31,7 +31,8 @@
 
 #include <Corrade/Containers/Array.h>
 
-#include "Magnum/ImageView.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/PixelStorage.h"
 
 namespace Magnum {
 
@@ -350,9 +351,7 @@ template<UnsignedInt dimensions> class Image {
          *
          * See @ref PixelStorage::dataProperties() for more information.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Implementation::imageDataProperties<dimensions>(*this);
-        }
 
         /**
          * @brief Raw data
@@ -597,9 +596,7 @@ template<UnsignedInt dimensions> class CompressedImage {
          * See @ref CompressedPixelStorage::dataProperties() for more
          * information.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Implementation::compressedImageDataProperties<dimensions>(*this);
-        }
 
         /**
          * @brief Raw data
@@ -677,63 +674,6 @@ typedef CompressedImage<2> CompressedImage2D;
 /** @brief Three-dimensional compressed image */
 typedef CompressedImage<3> CompressedImage3D;
 
-template<UnsignedInt dimensions> inline Image<dimensions>::Image(Image<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _formatExtra{std::move(other._formatExtra)}, _pixelSize{std::move(other._pixelSize)}, _size{std::move(other._size)}, _data{std::move(other._data)} {
-    other._size = {};
-}
-
-template<UnsignedInt dimensions> inline CompressedImage<dimensions>::CompressedImage(CompressedImage<dimensions>&& other) noexcept: _storage{std::move(other._storage)}, _format{std::move(other._format)}, _size{std::move(other._size)}, _data{std::move(other._data)}
-{
-    other._size = {};
-}
-
-template<UnsignedInt dimensions> inline Image<dimensions>& Image<dimensions>::operator=(Image<dimensions>&& other) noexcept {
-    using std::swap;
-    swap(_storage, other._storage);
-    swap(_format, other._format);
-    swap(_formatExtra, other._formatExtra);
-    swap(_pixelSize, other._pixelSize);
-    swap(_size, other._size);
-    swap(_data, other._data);
-    return *this;
-}
-
-template<UnsignedInt dimensions> inline CompressedImage<dimensions>& CompressedImage<dimensions>::operator=(CompressedImage<dimensions>&& other) noexcept {
-    using std::swap;
-    swap(_storage, other._storage);
-    swap(_format, other._format);
-    swap(_size, other._size);
-    swap(_data, other._data);
-    return *this;
-}
-
-template<UnsignedInt dimensions> inline Image<dimensions>::operator ImageView<dimensions, char>() {
-    return ImageView<dimensions, char>{_storage, _format, _formatExtra, _pixelSize, _size, _data};
-}
-
-template<UnsignedInt dimensions> inline Image<dimensions>::operator ImageView<dimensions, const char>() const {
-    return ImageView<dimensions, const char>{_storage, _format, _formatExtra, _pixelSize, _size, _data};
-}
-
-template<UnsignedInt dimensions> inline CompressedImage<dimensions>::operator CompressedImageView<dimensions, char>() {
-    return CompressedImageView<dimensions, char>{_storage, _format, _size, _data};
-}
-
-template<UnsignedInt dimensions> inline CompressedImage<dimensions>::operator CompressedImageView<dimensions, const char>() const {
-    return CompressedImageView<dimensions, const char>{_storage, _format, _size, _data};
-}
-
-template<UnsignedInt dimensions> inline Containers::Array<char> Image<dimensions>::release() {
-    Containers::Array<char> data{std::move(_data)};
-    _size = {};
-    return data;
-}
-
-template<UnsignedInt dimensions> inline Containers::Array<char> CompressedImage<dimensions>::release() {
-    Containers::Array<char> data{std::move(_data)};
-    _size = {};
-    return data;
-}
-
 template<UnsignedInt dimensions> template<class T, class U> inline Image<dimensions>::Image(const PixelStorage storage, const T format, const U formatExtra, const VectorTypeFor<dimensions, Int>& size, Containers::Array<char>&& data) noexcept: Image{storage, UnsignedInt(format), UnsignedInt(formatExtra), Implementation::pixelSizeAdl(format, formatExtra), size, std::move(data)} {
     static_assert(sizeof(T) <= 4 && sizeof(U) <= 4,
         "format types larger than 32bits are not supported");

src/Magnum/ImageView.cpp

@@ -26,7 +26,7 @@
 #include "ImageView.h"
 
 #include "Magnum/PixelFormat.h"
-#include "Magnum/Implementation/ImagePixelView.h"
+#include "Magnum/Implementation/ImageProperties.h"
 
 namespace Magnum {
 
@@ -44,6 +44,10 @@ template<UnsignedInt dimensions, class T> ImageView<dimensions, T>::ImageView(co
 
 template<UnsignedInt dimensions, class T> ImageView<dimensions, T>::ImageView(const PixelStorage storage, const PixelFormat format, const UnsignedInt formatExtra, const UnsignedInt pixelSize, const VectorTypeFor<dimensions, Int>& size) noexcept: _storage{storage}, _format{format}, _formatExtra{formatExtra}, _pixelSize{pixelSize}, _size{size}, _data{nullptr} {}
 
+template<UnsignedInt dimensions, class T> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> ImageView<dimensions, T>::dataProperties() const {
+    return Implementation::imageDataProperties<dimensions>(*this);
+}
+
 template<UnsignedInt dimensions, class T> void ImageView<dimensions, T>::setData(const Containers::ArrayView<ErasedType> data) {
     CORRADE_ASSERT(Implementation::imageDataSize(*this) <= data.size(), "ImageView::setData(): data too small, got" << data.size() << "but expected at least" << Implementation::imageDataSize(*this) << "bytes", );
     _data = {reinterpret_cast<Type*>(data.data()), data.size()};
@@ -61,6 +65,10 @@ template<UnsignedInt dimensions, class T> CompressedImageView<dimensions, T>::Co
 
 template<UnsignedInt dimensions, class T> CompressedImageView<dimensions, T>::CompressedImageView(const CompressedPixelStorage storage, const UnsignedInt format, const VectorTypeFor<dimensions, Int>& size) noexcept: CompressedImageView{storage, compressedPixelFormatWrap(format), size} {}
 
+template<UnsignedInt dimensions, class T> std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> CompressedImageView<dimensions, T>::dataProperties() const {
+    return Implementation::compressedImageDataProperties<dimensions>(*this);
+}
+
 #ifndef DOXYGEN_GENERATING_OUTPUT
 template class MAGNUM_EXPORT ImageView<1, const char>;
 template class MAGNUM_EXPORT ImageView<2, const char>;

src/Magnum/ImageView.h

@@ -400,9 +400,7 @@ template<UnsignedInt dimensions, class T> class ImageView {
          *
          * See @ref PixelStorage::dataProperties() for more information.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Implementation::imageDataProperties<dimensions>(*this);
-        }
 
         /**
          * @brief Image data
@@ -726,9 +724,7 @@ template<UnsignedInt dimensions, class T> class CompressedImageView {
          * See @ref CompressedPixelStorage::dataProperties() for more
          * information.
          */
-        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const {
+        std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> dataProperties() const;
-            return Implementation::compressedImageDataProperties<dimensions>(*this);
-        }
 
         /** @brief Image data */
         Containers::ArrayView<Type> data() const { return _data; }
@@ -812,16 +808,6 @@ typedef CompressedImageView<2, char> MutableCompressedImageView2D;
 */
 typedef CompressedImageView<3, char> MutableCompressedImageView3D;
 
-namespace Implementation {
-    template<class T> inline UnsignedInt pixelSizeAdl(T format) {
-        return pixelSize(format);
-    }
-
-    template<class T, class U> inline UnsignedInt pixelSizeAdl(T format, U formatExtra) {
-        return pixelSize(format, formatExtra);
-    }
-}
-
 template<UnsignedInt dimensions, class T> template<class U, class V> inline ImageView<dimensions, T>::ImageView(const PixelStorage storage, const U format, const V formatExtra, const VectorTypeFor<dimensions, Int>& size, const Containers::ArrayView<ErasedType> data) noexcept: ImageView{storage, UnsignedInt(format), UnsignedInt(formatExtra), Implementation::pixelSizeAdl(format, formatExtra), size, data} {
     static_assert(sizeof(T) <= 4 && sizeof(U) <= 4,
         "format types larger than 32bits are not supported");

src/Magnum/Implementation/ImageProperties.h

@@ -1,5 +1,5 @@
-#ifndef Magnum_Implementation_ImagePixelView_h
+#ifndef Magnum_Implementation_ImageProperties_h
-#define Magnum_Implementation_ImagePixelView_h
+#define Magnum_Implementation_ImageProperties_h
 /*
     This file is part of Magnum.
 
@@ -33,6 +33,18 @@
 
 namespace Magnum { namespace Implementation {
 
+/* Used in *Image::dataProperties() */
+template<std::size_t dimensions, class T> std::pair<Math::Vector<dimensions, std::size_t>, Math::Vector<dimensions, std::size_t>> imageDataProperties(const T& image) {
+    std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(image.pixelSize(), Vector3i::pad(image.size(), 1));
+    return std::make_pair(Math::Vector<dimensions, std::size_t>::pad(dataProperties.first), Math::Vector<dimensions, std::size_t>::pad(dataProperties.second));
+}
+
+/* Used in Compressed*Image::dataProperties() */
+template<std::size_t dimensions, class T> std::pair<Math::Vector<dimensions, std::size_t>, Math::Vector<dimensions, std::size_t>> compressedImageDataProperties(const T& image) {
+    std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(Vector3i::pad(image.size(), 1));
+    return std::make_pair(Math::Vector<dimensions, std::size_t>::pad(dataProperties.first), Math::Vector<dimensions, std::size_t>::pad(dataProperties.second));
+}
+
 template<UnsignedInt dimensions, class T, class Image> Containers::StridedArrayView<dimensions + 1, T> imagePixelView(Image& image) {
     const std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> properties = image.dataProperties();
 

src/Magnum/MeshTools/Test/CompileGLTest.cpp

@@ -28,6 +28,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/Mesh.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/DebugTools/CompareImage.h"

src/Magnum/PixelStorage.h

@@ -246,16 +246,13 @@ class MAGNUM_EXPORT CompressedPixelStorage: public PixelStorage {
 constexpr PixelStorage::PixelStorage() noexcept: _rowLength{0}, _imageHeight{0}, _skip{0}, _alignment{4} {}
 
 namespace Implementation {
-    /* Used in *Image::dataProperties() */
+    /* Used in templated image[view] constructors */
-    template<std::size_t dimensions, class T> std::pair<Math::Vector<dimensions, std::size_t>, Math::Vector<dimensions, std::size_t>> imageDataProperties(const T& image) {
+    template<class T> inline UnsignedInt pixelSizeAdl(T format) {
-        std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(image.pixelSize(), Vector3i::pad(image.size(), 1));
+        return pixelSize(format);
-        return std::make_pair(Math::Vector<dimensions, std::size_t>::pad(dataProperties.first), Math::Vector<dimensions, std::size_t>::pad(dataProperties.second));
     }
 
-    /* Used in Compressed*Image::dataProperties() */
+    template<class T, class U> inline UnsignedInt pixelSizeAdl(T format, U formatExtra) {
-    template<std::size_t dimensions, class T> std::pair<Math::Vector<dimensions, std::size_t>, Math::Vector<dimensions, std::size_t>> compressedImageDataProperties(const T& image) {
+        return pixelSize(format, formatExtra);
-        std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(Vector3i::pad(image.size(), 1));
-        return std::make_pair(Math::Vector<dimensions, std::size_t>::pad(dataProperties.first), Math::Vector<dimensions, std::size_t>::pad(dataProperties.second));
     }
 
     /* Used in image query functions */

src/Magnum/Test/ImageTest.cpp

@@ -29,6 +29,7 @@
 #include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/Math/Color.h"
 #include "Magnum/PixelFormat.h"
 

src/Magnum/Text/AbstractGlyphCache.cpp

@@ -26,6 +26,7 @@
 #include "AbstractGlyphCache.h"
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/TextureTools/Atlas.h"
 
 namespace Magnum { namespace Text {

src/Magnum/Text/Test/AbstractGlyphCacheTest.cpp

@@ -29,6 +29,7 @@
 #include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Text/AbstractGlyphCache.h"
 

src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Math/Color.h"
 #include "Magnum/Math/Range.h"

src/Magnum/TextureTools/distancefieldconverter.cpp

@@ -30,6 +30,7 @@
 #include <Corrade/PluginManager/Manager.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Math/ConfigurationValue.h"
 #include "Magnum/Math/Range.h"

src/Magnum/Trade/AbstractImageConverter.cpp

@@ -33,6 +33,7 @@
 #include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/Trade/ImageData.h"
 
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT

src/Magnum/Trade/ImageData.cpp

@@ -27,8 +27,9 @@
 
 #include <Corrade/Containers/StridedArrayView.h>
 
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
-#include "Magnum/Implementation/ImagePixelView.h"
+#include "Magnum/Implementation/ImageProperties.h"
 
 namespace Magnum { namespace Trade {
 
@@ -44,10 +45,44 @@ template<UnsignedInt dimensions> ImageData<dimensions>::ImageData(const Compress
 
 template<UnsignedInt dimensions> ImageData<dimensions>::ImageData(const CompressedPixelStorage storage, const UnsignedInt format, const VectorTypeFor<dimensions, Int>& size, Containers::Array<char>&& data, const void* const importerState) noexcept: ImageData{storage, compressedPixelFormatWrap(format), size, std::move(data), importerState} {}
 
+template<UnsignedInt dimensions> ImageData<dimensions>::ImageData(ImageData<dimensions>&& other) noexcept: _compressed{std::move(other._compressed)}, _size{std::move(other._size)}, _data{std::move(other._data)}, _importerState{std::move(other._importerState)} {
+    if(_compressed) {
+        new(&_compressedStorage) CompressedPixelStorage{std::move(other._compressedStorage)};
+        _compressedFormat = std::move(other._compressedFormat);
+    }
+    else {
+        new(&_storage) PixelStorage{std::move(other._storage)};
+        _format = std::move(other._format);
+        _formatExtra = std::move(other._formatExtra);
+        _pixelSize = std::move(other._pixelSize);
+    }
+
+    other._size = {};
+}
+
 template<UnsignedInt dimensions> ImageData<dimensions>::ImageData(ImageData<dimensions>&& other, const void* const importerState) noexcept: ImageData{std::move(other)} {
     _importerState = importerState;
 }
 
+template<UnsignedInt dimensions> ImageData<dimensions>& ImageData<dimensions>::operator=(ImageData<dimensions>&& other) noexcept {
+    using std::swap;
+    swap(_compressed, other._compressed);
+    if(_compressed) {
+        swap(_compressedStorage, other._compressedStorage);
+        swap(_compressedFormat, other._compressedFormat);
+    }
+    else {
+        swap(_storage, other._storage);
+        swap(_format, other._format);
+    }
+    swap(_formatExtra, other._formatExtra);
+    swap(_pixelSize, other._pixelSize);
+    swap(_size, other._size);
+    swap(_data, other._data);
+    swap(_importerState, other._importerState);
+    return *this;
+}
+
 template<UnsignedInt dimensions> PixelStorage ImageData<dimensions>::storage() const {
     CORRADE_ASSERT(!_compressed, "Trade::ImageData::storage(): the image is compressed", {});
     return _storage;
@@ -117,6 +152,12 @@ template<UnsignedInt dimensions> ImageData<dimensions>::operator CompressedImage
         _compressedFormat, _size, _data};
 }
 
+template<UnsignedInt dimensions> Containers::Array<char> ImageData<dimensions>::release() {
+    Containers::Array<char> data{std::move(_data)};
+    _size = {};
+    return data;
+}
+
 #ifndef DOXYGEN_GENERATING_OUTPUT
 template class MAGNUM_TRADE_EXPORT ImageData<1>;
 template class MAGNUM_TRADE_EXPORT ImageData<2>;

src/Magnum/Trade/ImageData.h

@@ -31,7 +31,8 @@
 
 #include <Corrade/Containers/Array.h>
 
-#include "Magnum/ImageView.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/PixelStorage.h"
 #include "Magnum/Trade/visibility.h"
 
 namespace Magnum { namespace Trade {
@@ -468,46 +469,6 @@ template<UnsignedInt dimensions> template<class T> ImageData<dimensions>::ImageD
         "format types larger than 32bits are not supported");
 }
 
-template<UnsignedInt dimensions> inline ImageData<dimensions>::ImageData(ImageData<dimensions>&& other) noexcept: _compressed{std::move(other._compressed)}, _size{std::move(other._size)}, _data{std::move(other._data)}, _importerState{std::move(other._importerState)} {
-    if(_compressed) {
-        new(&_compressedStorage) CompressedPixelStorage{std::move(other._compressedStorage)};
-        _compressedFormat = std::move(other._compressedFormat);
-    }
-    else {
-        new(&_storage) PixelStorage{std::move(other._storage)};
-        _format = std::move(other._format);
-        _formatExtra = std::move(other._formatExtra);
-        _pixelSize = std::move(other._pixelSize);
-    }
-
-    other._size = {};
-}
-
-template<UnsignedInt dimensions> inline ImageData<dimensions>& ImageData<dimensions>::operator=(ImageData<dimensions>&& other) noexcept {
-    using std::swap;
-    swap(_compressed, other._compressed);
-    if(_compressed) {
-        swap(_compressedStorage, other._compressedStorage);
-        swap(_compressedFormat, other._compressedFormat);
-    }
-    else {
-        swap(_storage, other._storage);
-        swap(_format, other._format);
-    }
-    swap(_formatExtra, other._formatExtra);
-    swap(_pixelSize, other._pixelSize);
-    swap(_size, other._size);
-    swap(_data, other._data);
-    swap(_importerState, other._importerState);
-    return *this;
-}
-
-template<UnsignedInt dimensions> inline Containers::Array<char> ImageData<dimensions>::release() {
-    Containers::Array<char> data{std::move(_data)};
-    _size = {};
-    return data;
-}
-
 }}
 
 #endif

src/Magnum/Trade/Test/AbstractImageConverterTest.cpp

@@ -33,6 +33,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Trade/AbstractImageConverter.h"
 #include "Magnum/Trade/ImageData.h"

src/Magnum/Trade/Test/ImageDataTest.cpp

@@ -28,6 +28,7 @@
 #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"

src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp

@@ -30,6 +30,7 @@
 #include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/FormatStl.h>
 
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Trade/AbstractImageConverter.h"
 #include "Magnum/Trade/ImageData.h"

src/MagnumPlugins/MagnumFont/MagnumFont.cpp

@@ -32,6 +32,7 @@
 #include <Corrade/Utility/Directory.h>
 #include <Corrade/Utility/Unicode.h>
 
+#include "Magnum/ImageView.h"
 #include "Magnum/Math/ConfigurationValue.h"
 #include "Magnum/Text/GlyphCache.h"
 #include "Magnum/Trade/ImageData.h"

src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp

@@ -32,6 +32,7 @@
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Math/ConfigurationValue.h"
 #include "Magnum/Text/AbstractFont.h"

src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp

@@ -32,7 +32,7 @@
 #include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Directory.h>
 
-#include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Trade/ImageData.h"
 #include "Magnum/Trade/AbstractImageConverter.h"

src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

@@ -31,7 +31,7 @@
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Utility/Endianness.h>
 
-#include "Magnum/Image.h"
+#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Math/Swizzle.h"
 #include "Magnum/Math/Vector4.h"