CroppedArrayRef: also transitively establish base's invariants

Author: LebedevRI

src/librawspeed/adt/Array1DRef.h

@@ -33,15 +33,15 @@ template <class T> class Array1DRef final {
   T* data = nullptr;
   int numElts = 0;
 
-  void establishClassInvariants() const noexcept;
-
   friend Array1DRef<const T>; // We need to be able to convert to const version.
 
   // We need to be able to convert to std::byte.
   friend Array1DRef<std::byte>;
   friend Array1DRef<const std::byte>;
 
 public:
+  void establishClassInvariants() const noexcept;
+
   using value_type = T;
   using cvless_value_type = std::remove_cv_t<value_type>;
 

src/librawspeed/adt/Array2DRef.h

@@ -34,15 +34,15 @@ template <class T> class Array2DRef final {
   T* _data = nullptr;
   int _pitch = 0;
 
-  void establishClassInvariants() const noexcept;
-
   friend Array2DRef<const T>; // We need to be able to convert to const version.
 
   // We need to be able to convert to std::byte.
   friend Array2DRef<std::byte>;
   friend Array2DRef<const std::byte>;
 
 public:
+  void establishClassInvariants() const noexcept;
+
   using value_type = T;
   using cvless_value_type = std::remove_cv_t<value_type>;
 

src/librawspeed/adt/CroppedArray1DRef.h

@@ -32,8 +32,6 @@ template <class T> class CroppedArray1DRef final {
   int offset = 0;
   int numElts = 0;
 
-  void establishClassInvariants() const noexcept;
-
   friend CroppedArray1DRef<const T>; // We need to be able to convert to const
                                      // version.
 
@@ -43,6 +41,8 @@ template <class T> class CroppedArray1DRef final {
   CroppedArray1DRef(Array1DRef<T> base, int offset, int numElts);
 
 public:
+  void establishClassInvariants() const noexcept;
+
   using value_type = T;
   using cvless_value_type = std::remove_cv_t<value_type>;
 
@@ -87,6 +87,7 @@ CroppedArray1DRef(Array1DRef<T> base, int offset, int numElts)
 
 template <class T>
 inline void CroppedArray1DRef<T>::establishClassInvariants() const noexcept {
+  base.establishClassInvariants();
   invariant(offset >= 0);
   invariant(numElts >= 0);
   invariant(offset <= base.size());

src/librawspeed/adt/CroppedArray2DRef.h

@@ -31,12 +31,12 @@ namespace rawspeed {
 template <class T> class CroppedArray2DRef final {
   const Array2DRef<T> base;
 
-  void establishClassInvariants() const noexcept;
-
   // We need to be able to convert to const version.
   friend CroppedArray2DRef<const T>;
 
 public:
+  void establishClassInvariants() const noexcept;
+
   using value_type = T;
   using cvless_value_type = std::remove_cv_t<value_type>;
 
@@ -88,6 +88,7 @@ explicit CroppedArray2DRef(Array2DRef<T> base_, int offsetCols_,
 
 template <class T>
 inline void CroppedArray2DRef<T>::establishClassInvariants() const noexcept {
+  base.establishClassInvariants();
   invariant(offsetCols >= 0);
   invariant(offsetRows >= 0);
   invariant(croppedWidth >= 0);