Array1DRef: add getBlock() QOL helper

Author: LebedevRI

src/librawspeed/adt/Array1DRef.h

@@ -79,6 +79,7 @@ template <class T> class Array1DRef final {
         numElts(sizeof(T2) * RHS.numElts) {}
 
   [[nodiscard]] CroppedArray1DRef<T> getCrop(int offset, int numElts) const;
+  [[nodiscard]] CroppedArray1DRef<T> getBlock(int numElts, int index) const;
 
   [[nodiscard]] int RAWSPEED_READONLY size() const;
 
@@ -116,6 +117,17 @@ template <class T>
   return {*this, offset, size};
 }
 
+template <class T>
+[[nodiscard]] CroppedArray1DRef<T> Array1DRef<T>::getBlock(int size,
+                                                           int index) const {
+  establishClassInvariants();
+  invariant(index >= 0);
+  invariant(size >= 0);
+  invariant(index <= numElts);
+  invariant(size <= numElts);
+  return getCrop(size * index, size);
+}
+
 template <class T> inline T* Array1DRef<T>::addressOf(const int eltIdx) const {
   establishClassInvariants();
   invariant(eltIdx >= 0);

src/librawspeed/common/RawImage.cpp

@@ -299,7 +299,7 @@ void RawImageData::fixBadPixelsThread(int start_y, int end_y) {
 
   for (int y = start_y; y < end_y; y++) {
     for (int x = 0; x < gw; x++) {
-      const auto block = bad[y].getCrop((32 * x) / 8, 4);
+      const auto block = bad[y].getBlock(32 / 8, x);
 
       // Test if there is a bad pixel within these 32 pixels
       if (std::all_of(block.begin(), block.end(),

src/librawspeed/decoders/ArwDecoder.cpp

@@ -565,11 +565,11 @@ void ArwDecoder::SonyDecrypt(Array1DRef<const uint8_t> ibuf,
     uint32_t pv = pad[p & 127];
 
     uint32_t bv;
-    memcpy(&bv, ibuf.getCrop(4 * i, 4).begin(), sizeof(uint32_t));
+    memcpy(&bv, ibuf.getBlock(4, i).begin(), sizeof(uint32_t));
 
     bv ^= pv;
 
-    memcpy(obuf.getCrop(4 * i, 4).begin(), &bv, sizeof(uint32_t));
+    memcpy(obuf.getBlock(4, i).begin(), &bv, sizeof(uint32_t));
 
     p++;
   }

src/librawspeed/decompressors/Cr2DecompressorImpl.h

@@ -434,8 +434,8 @@ void Cr2Decompressor<PrefixCodeDecoder>::decompressN_X_Y() const {
           for (int c = 0; c < N_COMP; ++c)
             pred[c] = predNext(c == 0 ? c : dsc.groupSize - (N_COMP - c));
           predNext = out[row]
-                         .getCrop(/*offset=*/dsc.groupSize * col,
-                                  /*size=*/dsc.groupSize)
+                         .getBlock(/*size=*/dsc.groupSize,
+                                   /*index=*/col)
                          .getAsArray1DRef();
           ++globalFrameRow;
           globalFrameCol = 0;

src/librawspeed/decompressors/PanasonicV7Decompressor.cpp

@@ -86,8 +86,7 @@ void PanasonicV7Decompressor::decompressRow(int row) const noexcept {
   ByteStream rowInput = input.getSubStream(bytesPerRow * row, bytesPerRow);
   for (int rblock = 0; rblock < blocksperrow; rblock++) {
     ByteStream block = rowInput.getStream(BytesPerBlock);
-    decompressBlock(block,
-                    outRow.getCrop(PixelsPerBlock * rblock, PixelsPerBlock));
+    decompressBlock(block, outRow.getBlock(PixelsPerBlock, rblock));
   }
 }