From f9661fe4022516d013a779168ab40a83e5dc7818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 30 Aug 2021 21:50:05 +0200
Subject: [PATCH] Math: add castInto() variants for UnsignedLong/Long.

There's now 24 overloads for unsigned types and 24 for signed types,
which is all possible combinations. Not adding an ability to cast
between signed and unsigned as I'm not sure what should be done there.
---
 doc/changelog.dox                         |  5 +-
 src/Magnum/Math/PackingBatch.cpp          | 56 +++++++++++++-
 src/Magnum/Math/PackingBatch.h            | 94 ++++++++++++++++++++---
 src/Magnum/Math/Test/PackingBatchTest.cpp | 19 ++++-
 4 files changed, 153 insertions(+), 21 deletions(-)

diff --git a/doc/changelog.dox b/doc/changelog.dox
index 88cc4f4c0..cb33b28fd 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -278,8 +278,9 @@ See also:
 @subsubsection changelog-latest-changes-math Math library
 
 -   Added @ref Math::castInto() overloads for casting between @ref UnsignedByte
-    and @ref UnsignedShort or @ref Byte and @ref Short, and for casting between
-    @ref Float and @ref Double
+    and @ref UnsignedShort or @ref Byte and @ref Short, from and to
+    @ref UnsignedLong / @ref Long, and for casting between @ref Float and
+    @ref Double
 -   @ref Math::RectangularMatrix is now explicitly convertible from matrices of
     different sizes, with a possibility to specify whether to fill the diagonal
     or leave it as zeros. This was originally available only on (square)
diff --git a/src/Magnum/Math/PackingBatch.cpp b/src/Magnum/Math/PackingBatch.cpp
index 268249fee..42b82c953 100644
--- a/src/Magnum/Math/PackingBatch.cpp
+++ b/src/Magnum/Math/PackingBatch.cpp
@@ -240,6 +240,14 @@ void castInto(const Corrade::Containers::StridedArrayView2D<const Float>& src, c
     castIntoImplementation(src, dst);
 }
 
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst) {
+    castIntoImplementation(src, dst);
+}
+
 void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedInt>& dst) {
     castIntoImplementation(src, dst);
 }
@@ -256,11 +264,51 @@ void castInto(const Corrade::Containers::StridedArrayView2D<const Short>& src, c
     castIntoImplementation(src, dst);
 }
 
-void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst) {
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst) {
     castIntoImplementation(src, dst);
 }
 
-void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst) {
+void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedShort>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Short>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedInt>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Int>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst) {
+    castIntoImplementation(src, dst);
+}
+
+void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst) {
     castIntoImplementation(src, dst);
 }
 
@@ -272,11 +320,11 @@ void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, con
     castIntoImplementation(src, dst);
 }
 
-void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst) {
+void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst) {
     castIntoImplementation(src, dst);
 }
 
-void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst) {
+void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst) {
     castIntoImplementation(src, dst);
 }
 
diff --git a/src/Magnum/Math/PackingBatch.h b/src/Magnum/Math/PackingBatch.h
index e3359c85d..5491f52e9 100644
--- a/src/Magnum/Math/PackingBatch.h
+++ b/src/Magnum/Math/PackingBatch.h
@@ -269,7 +269,7 @@ MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const
 @brief Cast integer values into a differently sized type
 @param[in]  src     Source values
 @param[out] dst     Destination values
-@m_since{2020,06}
+@m_since_latest
 
 Second dimension is meant to contain vector/matrix components, or have a size
 of 1 for scalars. Expects that @p src and @p dst have the same size and that
@@ -280,6 +280,18 @@ the second dimension in both is contiguous.
 
 @see @ref Corrade::Containers::StridedArrayView::isContiguous()
 */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst);
+
+/**
+ * @overload
+ * @m_since{2020,06}
+ */
 MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedInt>& dst);
 
 /**
@@ -302,39 +314,99 @@ MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const
 
 /**
  * @overload
- * @m_since{2020,06}
+ * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst);
 
 /**
  * @overload
- * @m_since{2020,06}
+ * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst);
 
 /**
  * @overload
- * @m_since{2020,06}
+ * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedShort>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst);
 
 /**
  * @overload
- * @m_since{2020,06}
+ * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Short>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst);
 
 /**
  * @overload
  * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedByte>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedLong>& dst);
 
 /**
  * @overload
  * @m_since_latest
  */
-MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Byte>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst);
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Long>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedInt>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Int>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedLong>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst);
+
+/**
+ * @overload
+ * @m_since_latest
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Long>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst);
+
+/**
+ * @overload
+ * @m_since{2020,06}
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedShort>& dst);
+
+/**
+ * @overload
+ * @m_since{2020,06}
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Short>& dst);
+
+/**
+ * @overload
+ * @m_since{2020,06}
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const UnsignedInt>& src, const Corrade::Containers::StridedArrayView2D<UnsignedByte>& dst);
+
+/**
+ * @overload
+ * @m_since{2020,06}
+ */
+MAGNUM_EXPORT void castInto(const Corrade::Containers::StridedArrayView2D<const Int>& src, const Corrade::Containers::StridedArrayView2D<Byte>& dst);
 
 /**
  * @overload
diff --git a/src/Magnum/Math/Test/PackingBatchTest.cpp b/src/Magnum/Math/Test/PackingBatchTest.cpp
index 5ac84c475..206a0abac 100644
--- a/src/Magnum/Math/Test/PackingBatchTest.cpp
+++ b/src/Magnum/Math/Test/PackingBatchTest.cpp
@@ -84,12 +84,17 @@ PackingBatchTest::PackingBatchTest() {
               &PackingBatchTest::castSignedFloat<Short>,
               &PackingBatchTest::castSignedFloat<Int>,
 
+              &PackingBatchTest::castUnsignedInteger<UnsignedByte, UnsignedShort>,
               &PackingBatchTest::castUnsignedInteger<UnsignedByte, UnsignedInt>,
               &PackingBatchTest::castUnsignedInteger<UnsignedShort, UnsignedInt>,
-              &PackingBatchTest::castUnsignedInteger<UnsignedByte, UnsignedShort>,
+              &PackingBatchTest::castUnsignedInteger<UnsignedByte, UnsignedLong>,
+              &PackingBatchTest::castUnsignedInteger<UnsignedShort, UnsignedLong>,
+              &PackingBatchTest::castUnsignedInteger<UnsignedShort, UnsignedLong>,
+              &PackingBatchTest::castSignedInteger<Byte, Short>,
               &PackingBatchTest::castSignedInteger<Byte, Int>,
               &PackingBatchTest::castSignedInteger<Short, Int>,
-              &PackingBatchTest::castSignedInteger<Byte, Short>,
+              &PackingBatchTest::castSignedInteger<Byte, Long>,
+              &PackingBatchTest::castSignedInteger<Short, Long>,
 
               &PackingBatchTest::castFloatDouble,
 
@@ -104,12 +109,18 @@ PackingBatchTest::PackingBatchTest() {
               &PackingBatchTest::assertionsCast<Float, Short>,
               &PackingBatchTest::assertionsCast<Float, UnsignedInt>,
               &PackingBatchTest::assertionsCast<Float, Int>,
+              &PackingBatchTest::assertionsCast<UnsignedShort, UnsignedByte>,
               &PackingBatchTest::assertionsCast<UnsignedInt, UnsignedByte>,
               &PackingBatchTest::assertionsCast<UnsignedInt, UnsignedShort>,
-              &PackingBatchTest::assertionsCast<UnsignedShort, UnsignedByte>,
+              &PackingBatchTest::assertionsCast<UnsignedLong, UnsignedByte>,
+              &PackingBatchTest::assertionsCast<UnsignedLong, UnsignedShort>,
+              &PackingBatchTest::assertionsCast<UnsignedLong, UnsignedInt>,
+              &PackingBatchTest::assertionsCast<Short, Byte>,
               &PackingBatchTest::assertionsCast<Int, Byte>,
               &PackingBatchTest::assertionsCast<Int, Short>,
-              &PackingBatchTest::assertionsCast<Short, Byte>,
+              &PackingBatchTest::assertionsCast<Long, Byte>,
+              &PackingBatchTest::assertionsCast<Long, Short>,
+              &PackingBatchTest::assertionsCast<Long, Int>,
               &PackingBatchTest::assertionsCast<Double, Float>});
 }