Move image-internal utilities to a private header.

No need for these to be in the public PixelStorage.h.

src/Magnum/GL/AbstractFramebuffer.cpp

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

src/Magnum/GL/AbstractTexture.cpp

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

src/Magnum/GL/CubeMapTexture.cpp

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

src/Magnum/Implementation/ImageProperties.h

@@ -68,6 +68,58 @@ template<std::size_t dimensions, class T> std::pair<Math::Vector<dimensions, std
     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 */
+template<std::size_t dimensions, class T> std::size_t imageDataSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
+    std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(image.pixelSize(), Vector3i::pad(size, 1));
+
+    /* Smallest line/rectangle/cube that covers the area */
+    std::size_t dataOffset = 0;
+    if(dataProperties.first.z())
+        dataOffset += dataProperties.first.z();
+    else if(dataProperties.first.y()) {
+        if(!image.storage().imageHeight())
+            dataOffset += dataProperties.first.y();
+    } else if(dataProperties.first.x()) {
+        if(!image.storage().rowLength())
+            dataOffset += dataProperties.first.x();
+    }
+    return dataOffset + dataProperties.second.product();
+}
+
+/* Used in data size assertions */
+template<class T> inline std::size_t imageDataSize(const T& image) {
+    return imageDataSizeFor(image, image.size());
+}
+
+template<std::size_t dimensions, class T> std::pair<std::size_t, std::size_t> compressedImageDataOffsetSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
+    CORRADE_INTERNAL_ASSERT(image.storage().compressedBlockSize().product() && image.storage().compressedBlockDataSize());
+
+    std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(Vector3i::pad(size, 1));
+
+    const auto realBlockCount = Math::Vector3<std::size_t>{(Vector3i::pad(size, 1) + image.storage().compressedBlockSize() - Vector3i{1})/image.storage().compressedBlockSize()};
+
+    return {dataProperties.first.sum(), (dataProperties.second.product() - (dataProperties.second.x() - realBlockCount.x()) - (dataProperties.second.y() - realBlockCount.y())*dataProperties.second.x())*image.storage().compressedBlockDataSize()};
+}
+
+/* Used in image query functions */
+template<std::size_t dimensions, class T> std::size_t compressedImageDataSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
+    auto r = compressedImageDataOffsetSizeFor(image, size);
+    return r.first + r.second;
+}
+
+/* Use in compressed image upload functions */
+template<class T> std::size_t occupiedCompressedImageDataSize(const T& image, std::size_t dataSize) {
+    return image.storage().compressedBlockSize().product() && image.storage().compressedBlockDataSize()
+        ? compressedImageDataOffsetSizeFor(image, image.size()).second : dataSize;
+}
+
+template<std::size_t dimensions, class T> std::ptrdiff_t pixelStorageSkipOffsetFor(const T& image, const Math::Vector<dimensions, Int>& size) {
+    return image.storage().dataProperties(image.pixelSize(), Vector3i::pad(size, 1)).first.sum();
+}
+template<class T> std::ptrdiff_t pixelStorageSkipOffset(const T& image) {
+    return pixelStorageSkipOffsetFor(image, image.size());
+}
+
 template<UnsignedInt dimensions, class T, class Image, class Data> Containers::StridedArrayView<dimensions + 1, T> imagePixelView(Image& image, const Data data) {
     const std::pair<VectorTypeFor<dimensions, std::size_t>, VectorTypeFor<dimensions, std::size_t>> properties = image.dataProperties();
 

src/Magnum/PixelStorage.h

@@ -257,58 +257,6 @@ namespace Implementation {
     template<class T, class U> inline UnsignedInt pixelFormatSizeAdl(T format, U formatExtra) {
         return pixelFormatSize(format, formatExtra);
     }
-
-    /* Used in image query functions */
-    template<std::size_t dimensions, class T> std::size_t imageDataSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
-        std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(image.pixelSize(), Vector3i::pad(size, 1));
-
-        /* Smallest line/rectangle/cube that covers the area */
-        std::size_t dataOffset = 0;
-        if(dataProperties.first.z())
-            dataOffset += dataProperties.first.z();
-        else if(dataProperties.first.y()) {
-            if(!image.storage().imageHeight())
-                dataOffset += dataProperties.first.y();
-        } else if(dataProperties.first.x()) {
-            if(!image.storage().rowLength())
-                dataOffset += dataProperties.first.x();
-        }
-        return dataOffset + dataProperties.second.product();
-    }
-
-    /* Used in data size assertions */
-    template<class T> inline std::size_t imageDataSize(const T& image) {
-        return imageDataSizeFor(image, image.size());
-    }
-
-    template<std::size_t dimensions, class T> std::pair<std::size_t, std::size_t> compressedImageDataOffsetSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
-        CORRADE_INTERNAL_ASSERT(image.storage().compressedBlockSize().product() && image.storage().compressedBlockDataSize());
-
-        std::pair<Math::Vector3<std::size_t>, Math::Vector3<std::size_t>> dataProperties = image.storage().dataProperties(Vector3i::pad(size, 1));
-
-        const auto realBlockCount = Math::Vector3<std::size_t>{(Vector3i::pad(size, 1) + image.storage().compressedBlockSize() - Vector3i{1})/image.storage().compressedBlockSize()};
-
-        return {dataProperties.first.sum(), (dataProperties.second.product() - (dataProperties.second.x() - realBlockCount.x()) - (dataProperties.second.y() - realBlockCount.y())*dataProperties.second.x())*image.storage().compressedBlockDataSize()};
-    }
-
-    /* Used in image query functions */
-    template<std::size_t dimensions, class T> std::size_t compressedImageDataSizeFor(const T& image, const Math::Vector<dimensions, Int>& size) {
-        auto r = compressedImageDataOffsetSizeFor(image, size);
-        return r.first + r.second;
-    }
-
-    /* Use in compressed image upload functions */
-    template<class T> std::size_t occupiedCompressedImageDataSize(const T& image, std::size_t dataSize) {
-        return image.storage().compressedBlockSize().product() && image.storage().compressedBlockDataSize()
-            ? compressedImageDataOffsetSizeFor(image, image.size()).second : dataSize;
-    }
-
-    template<std::size_t dimensions, class T> std::ptrdiff_t pixelStorageSkipOffsetFor(const T& image, const Math::Vector<dimensions, Int>& size) {
-        return image.storage().dataProperties(image.pixelSize(), Vector3i::pad(size, 1)).first.sum();
-    }
-    template<class T> std::ptrdiff_t pixelStorageSkipOffset(const T& image) {
-        return pixelStorageSkipOffsetFor(image, image.size());
-    }
 }
 
 }

src/Magnum/Test/PixelStorageTest.cpp

@@ -30,6 +30,7 @@
 #include "Magnum/Image.h"
 #include "Magnum/PixelFormat.h"
 #include "Magnum/PixelStorage.h"
+#include "Magnum/Implementation/ImageProperties.h"
 
 namespace Magnum { namespace Test { namespace {