Homogenize decompressor names

Only the Panasonic ones have their version suffix after the "Decompressor",
Samsung and Sony ones have it right after the name before "Decompressor".

Author: LebedevRI

fuzz/all-fuzzers.txt

@@ -71,9 +71,9 @@ KodakDecompressorFuzzer
 LJpegDecompressorFuzzer
 NikonDecompressorFuzzer
 OlympusDecompressorFuzzer
-PanasonicDecompressorV4Fuzzer
-PanasonicDecompressorV5Fuzzer
-PanasonicDecompressorV6Fuzzer
+PanasonicV4DecompressorFuzzer
+PanasonicV5DecompressorFuzzer
+PanasonicV6DecompressorFuzzer
 PentaxDecompressorFuzzer
 PhaseOneDecompressorFuzzer
 RawParserFuzzer-GetDecoder

fuzz/librawspeed/decompressors/CMakeLists.txt

@@ -19,9 +19,9 @@ set(DECOMPRESSORS
   "LJpegDecompressor"
   "NikonDecompressor"
   "OlympusDecompressor"
-  "PanasonicDecompressorV4"
-  "PanasonicDecompressorV5"
-  "PanasonicDecompressorV6"
+  "PanasonicV4Decompressor"
+  "PanasonicV5Decompressor"
+  "PanasonicV6Decompressor"
   "PentaxDecompressor"
   "PhaseOneDecompressor"
   "SamsungV0Decompressor"

fuzz/librawspeed/decompressors/PanasonicDecompressorV4.cpp fuzz/librawspeed/decompressors/PanasonicV4Decompressor.cpp

@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "decompressors/PanasonicDecompressorV4.h" // for PanasonicDecompressor
+#include "decompressors/PanasonicV4Decompressor.h" // for PanasonicDecompressor
 #include "common/RawImage.h"                       // for RawImage
 #include "common/RawspeedException.h"              // for RawspeedException
 #include "fuzz/Common.h"                           // for CreateRawImage
@@ -45,7 +45,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const auto section_split_offset = bs.get<uint32_t>();
     rawspeed::ByteStream rawData = bs.getStream(bs.getRemainSize());
 
-    rawspeed::PanasonicDecompressorV4 p(mRaw, rawData, zero_is_not_bad,
+    rawspeed::PanasonicV4Decompressor p(mRaw, rawData, zero_is_not_bad,
                                         section_split_offset);
     mRaw->createData();
     p.decompress();

fuzz/librawspeed/decompressors/PanasonicDecompressorV5.cpp fuzz/librawspeed/decompressors/PanasonicV5Decompressor.cpp

@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "decompressors/PanasonicDecompressorV5.h"
+#include "decompressors/PanasonicV5Decompressor.h"
 #include "common/RawImage.h"          // for RawImage, RawImageData
 #include "common/RawspeedException.h" // for RawspeedException
 #include "fuzz/Common.h"              // for CreateRawImage
@@ -43,7 +43,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const auto bps = bs.get<uint32_t>();
     rawspeed::ByteStream rawData = bs.getStream(bs.getRemainSize());
 
-    rawspeed::PanasonicDecompressorV5 p(mRaw, rawData, bps);
+    rawspeed::PanasonicV5Decompressor p(mRaw, rawData, bps);
     mRaw->createData();
     p.decompress();
 

fuzz/librawspeed/decompressors/PanasonicDecompressorV6.cpp fuzz/librawspeed/decompressors/PanasonicV6Decompressor.cpp

@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "decompressors/PanasonicDecompressorV6.h"
+#include "decompressors/PanasonicV6Decompressor.h"
 #include "common/RawImage.h"          // for RawImage, RawImageData
 #include "common/RawspeedException.h" // for RawspeedException
 #include "fuzz/Common.h"              // for CreateRawImage
@@ -43,7 +43,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
 
     rawspeed::ByteStream rawData = bs.getStream(bs.getRemainSize());
 
-    rawspeed::PanasonicDecompressorV6 p(mRaw, rawData);
+    rawspeed::PanasonicV6Decompressor p(mRaw, rawData);
     mRaw->createData();
     p.decompress();
 

src/librawspeed/decoders/Rw2Decoder.cpp

@@ -23,9 +23,9 @@
 #include "common/Common.h"                          // for writeLog, DEBUG_...
 #include "common/Point.h"                           // for iPoint2D
 #include "decoders/RawDecoderException.h"           // for ThrowRDE
-#include "decompressors/PanasonicDecompressorV4.h"  // for PanasonicDecompr...
-#include "decompressors/PanasonicDecompressorV5.h"  // for PanasonicDecompr...
-#include "decompressors/PanasonicDecompressorV6.h"  // for PanasonicDecompr...
+#include "decompressors/PanasonicV4Decompressor.h"  // for PanasonicDecompr...
+#include "decompressors/PanasonicV5Decompressor.h"  // for PanasonicDecompr...
+#include "decompressors/PanasonicV6Decompressor.h"  // for PanasonicDecompr...
 #include "decompressors/UncompressedDecompressor.h" // for UncompressedDeco...
 #include "io/Buffer.h"                              // for Buffer, DataBuffer
 #include "io/ByteStream.h"                          // for ByteStream
@@ -102,7 +102,7 @@ RawImage Rw2Decoder::decodeRawInternal() {
       u.decode12BitRaw<Endianness::little, false, true>(width, height);
     } else {
       uint32_t section_split_offset = 0;
-      PanasonicDecompressorV4 p(
+      PanasonicV4Decompressor p(
           mRaw,
           ByteStream(DataBuffer(mFile.getSubView(offset), Endianness::little)),
           hints.has("zero_is_not_bad"), section_split_offset);
@@ -130,20 +130,20 @@ RawImage Rw2Decoder::decodeRawInternal() {
                 raw->getEntry(TiffTag::PANASONIC_RAWFORMAT)->getU16()) {
     case 4: {
       uint32_t section_split_offset = 0x1FF8;
-      PanasonicDecompressorV4 p(mRaw, bs, hints.has("zero_is_not_bad"),
+      PanasonicV4Decompressor p(mRaw, bs, hints.has("zero_is_not_bad"),
                                 section_split_offset);
       mRaw->createData();
       p.decompress();
       return mRaw;
     }
     case 5: {
-      PanasonicDecompressorV5 v5(mRaw, bs, bitsPerSample);
+      PanasonicV5Decompressor v5(mRaw, bs, bitsPerSample);
       mRaw->createData();
       v5.decompress();
       return mRaw;
     }
     case 6: {
-      PanasonicDecompressorV6 v6(mRaw, bs);
+      PanasonicV6Decompressor v6(mRaw, bs);
       mRaw->createData();
       v6.decompress();
       return mRaw;

src/librawspeed/decompressors/CMakeLists.txt

@@ -32,12 +32,12 @@ FILE(GLOB SOURCES
   "NikonDecompressor.h"
   "OlympusDecompressor.cpp"
   "OlympusDecompressor.h"
-  "PanasonicDecompressorV4.cpp"
-  "PanasonicDecompressorV4.h"
-  "PanasonicDecompressorV5.cpp"
-  "PanasonicDecompressorV5.h"
-  "PanasonicDecompressorV6.cpp"
-  "PanasonicDecompressorV6.h"
+  "PanasonicV4Decompressor.cpp"
+  "PanasonicV4Decompressor.h"
+  "PanasonicV5Decompressor.cpp"
+  "PanasonicV5Decompressor.h"
+  "PanasonicV6Decompressor.cpp"
+  "PanasonicV6Decompressor.h"
   "PentaxDecompressor.cpp"
   "PentaxDecompressor.h"
   "PhaseOneDecompressor.cpp"

src/librawspeed/decompressors/PanasonicDecompressorV4.cpp src/librawspeed/decompressors/PanasonicV4Decompressor.cpp

@@ -21,7 +21,7 @@
 */
 
 #include "rawspeedconfig.h" // for HAVE_OPENMP
-#include "decompressors/PanasonicDecompressorV4.h"
+#include "decompressors/PanasonicV4Decompressor.h"
 #include "common/Array2DRef.h"            // for Array2DRef
 #include "common/Common.h"                // for extractHighBits, rawspeed_...
 #include "common/Mutex.h"                 // for MutexLocker
@@ -41,7 +41,7 @@
 
 namespace rawspeed {
 
-PanasonicDecompressorV4::PanasonicDecompressorV4(const RawImage& img,
+PanasonicV4Decompressor::PanasonicV4Decompressor(const RawImage& img,
                                                  const ByteStream& input_,
                                                  bool zero_is_not_bad,
                                                  uint32_t section_split_offset_)
@@ -80,7 +80,7 @@ PanasonicDecompressorV4::PanasonicDecompressorV4(const RawImage& img,
   chopInputIntoBlocks();
 }
 
-void PanasonicDecompressorV4::chopInputIntoBlocks() {
+void PanasonicV4Decompressor::chopInputIntoBlocks() {
   auto pixelToCoordinate = [width = mRaw->dim.x](unsigned pixel) {
     return iPoint2D(pixel % width, pixel / width);
   };
@@ -119,7 +119,7 @@ void PanasonicDecompressorV4::chopInputIntoBlocks() {
   blocks.back().endCoord.y -= 1;
 }
 
-class PanasonicDecompressorV4::ProxyStream {
+class PanasonicV4Decompressor::ProxyStream {
   ByteStream block;
   const uint32_t section_split_offset;
   std::vector<uint8_t> buf;
@@ -163,7 +163,7 @@ class PanasonicDecompressorV4::ProxyStream {
   }
 };
 
-inline void PanasonicDecompressorV4::processPixelPacket(
+inline void PanasonicV4Decompressor::processPixelPacket(
     ProxyStream& bits, int row, int col,
     std::vector<uint32_t>* zero_pos) const noexcept {
   const Array2DRef<uint16_t> out(mRaw->getU16DataAsUncroppedArray2DRef());
@@ -210,7 +210,7 @@ inline void PanasonicDecompressorV4::processPixelPacket(
   }
 }
 
-void PanasonicDecompressorV4::processBlock(
+void PanasonicV4Decompressor::processBlock(
     const Block& block, std::vector<uint32_t>* zero_pos) const noexcept {
   ProxyStream bits(block.bs, section_split_offset);
 
@@ -233,7 +233,7 @@ void PanasonicDecompressorV4::processBlock(
   }
 }
 
-void PanasonicDecompressorV4::decompressThread() const noexcept {
+void PanasonicV4Decompressor::decompressThread() const noexcept {
   std::vector<uint32_t> zero_pos;
 
   assert(!blocks.empty());
@@ -251,7 +251,7 @@ void PanasonicDecompressorV4::decompressThread() const noexcept {
   }
 }
 
-void PanasonicDecompressorV4::decompress() const noexcept {
+void PanasonicV4Decompressor::decompress() const noexcept {
   assert(!blocks.empty());
 #ifdef HAVE_OPENMP
 #pragma omp parallel default(none)                                             \

src/librawspeed/decompressors/PanasonicDecompressorV4.h src/librawspeed/decompressors/PanasonicV4Decompressor.h

@@ -30,7 +30,7 @@
 
 namespace rawspeed {
 
-class PanasonicDecompressorV4 final : public AbstractDecompressor {
+class PanasonicV4Decompressor final : public AbstractDecompressor {
   static constexpr uint32_t BlockSize = 0x4000;
 
   static constexpr int PixelsPerPacket = 14;
@@ -83,7 +83,7 @@ class PanasonicDecompressorV4 final : public AbstractDecompressor {
   void decompressThread() const noexcept;
 
 public:
-  PanasonicDecompressorV4(const RawImage& img, const ByteStream& input_,
+  PanasonicV4Decompressor(const RawImage& img, const ByteStream& input_,
                           bool zero_is_not_bad, uint32_t section_split_offset_);
 
   void decompress() const noexcept;

src/librawspeed/decompressors/PanasonicDecompressorV5.cpp src/librawspeed/decompressors/PanasonicV5Decompressor.cpp

@@ -21,7 +21,7 @@
 */
 
 #include "rawspeedconfig.h" // for HAVE_OPENMP
-#include "decompressors/PanasonicDecompressorV5.h"
+#include "decompressors/PanasonicV5Decompressor.h"
 #include "common/Array2DRef.h"            // for Array2DRef
 #include "common/Common.h"                // for rawspeed_get_number_of_pro...
 #include "common/Point.h"                 // for iPoint2D
@@ -40,26 +40,26 @@
 
 namespace rawspeed {
 
-struct PanasonicDecompressorV5::PacketDsc {
+struct PanasonicV5Decompressor::PacketDsc {
   Buffer::size_type bps;
   int pixelsPerPacket;
 
   constexpr PacketDsc();
   explicit constexpr PacketDsc(int bps_)
       : bps(bps_),
-        pixelsPerPacket(PanasonicDecompressorV5::bitsPerPacket / bps) {
+        pixelsPerPacket(PanasonicV5Decompressor::bitsPerPacket / bps) {
     // NOTE: the division is truncating. There may be some padding bits left.
   }
 };
 
-constexpr PanasonicDecompressorV5::PacketDsc
-    PanasonicDecompressorV5::TwelveBitPacket =
-        PanasonicDecompressorV5::PacketDsc(/*bps=*/12);
-constexpr PanasonicDecompressorV5::PacketDsc
-    PanasonicDecompressorV5::FourteenBitPacket =
-        PanasonicDecompressorV5::PacketDsc(/*bps=*/14);
+constexpr PanasonicV5Decompressor::PacketDsc
+    PanasonicV5Decompressor::TwelveBitPacket =
+        PanasonicV5Decompressor::PacketDsc(/*bps=*/12);
+constexpr PanasonicV5Decompressor::PacketDsc
+    PanasonicV5Decompressor::FourteenBitPacket =
+        PanasonicV5Decompressor::PacketDsc(/*bps=*/14);
 
-PanasonicDecompressorV5::PanasonicDecompressorV5(const RawImage& img,
+PanasonicV5Decompressor::PanasonicV5Decompressor(const RawImage& img,
                                                  const ByteStream& input_,
                                                  uint32_t bps_)
     : mRaw(img), bps(bps_) {
@@ -105,7 +105,7 @@ PanasonicDecompressorV5::PanasonicDecompressorV5(const RawImage& img,
   chopInputIntoBlocks(*dsc);
 }
 
-void PanasonicDecompressorV5::chopInputIntoBlocks(const PacketDsc& dsc) {
+void PanasonicV5Decompressor::chopInputIntoBlocks(const PacketDsc& dsc) {
   auto pixelToCoordinate = [width = mRaw->dim.x](unsigned pixel) {
     return iPoint2D(pixel % width, pixel / width);
   };
@@ -135,7 +135,7 @@ void PanasonicDecompressorV5::chopInputIntoBlocks(const PacketDsc& dsc) {
   blocks.back().endCoord.y -= 1;
 }
 
-class PanasonicDecompressorV5::ProxyStream {
+class PanasonicV5Decompressor::ProxyStream {
   ByteStream block;
   std::vector<uint8_t> buf;
   ByteStream input;
@@ -175,8 +175,8 @@ class PanasonicDecompressorV5::ProxyStream {
   }
 };
 
-template <const PanasonicDecompressorV5::PacketDsc& dsc>
-inline void PanasonicDecompressorV5::processPixelPacket(BitPumpLSB& bs, int row,
+template <const PanasonicV5Decompressor::PacketDsc& dsc>
+inline void PanasonicV5Decompressor::processPixelPacket(BitPumpLSB& bs, int row,
                                                         int col) const {
   static_assert(dsc.pixelsPerPacket > 0, "dsc should be compile-time const");
   static_assert(dsc.bps > 0 && dsc.bps <= 16);
@@ -193,8 +193,8 @@ inline void PanasonicDecompressorV5::processPixelPacket(BitPumpLSB& bs, int row,
   bs.skipBitsNoFill(bs.getFillLevel()); // get rid of padding.
 }
 
-template <const PanasonicDecompressorV5::PacketDsc& dsc>
-void PanasonicDecompressorV5::processBlock(const Block& block) const {
+template <const PanasonicV5Decompressor::PacketDsc& dsc>
+void PanasonicV5Decompressor::processBlock(const Block& block) const {
   static_assert(dsc.pixelsPerPacket > 0, "dsc should be compile-time const");
   static_assert(BlockSize % bytesPerPacket == 0);
 
@@ -220,8 +220,8 @@ void PanasonicDecompressorV5::processBlock(const Block& block) const {
   }
 }
 
-template <const PanasonicDecompressorV5::PacketDsc& dsc>
-void PanasonicDecompressorV5::decompressInternal() const noexcept {
+template <const PanasonicV5Decompressor::PacketDsc& dsc>
+void PanasonicV5Decompressor::decompressInternal() const noexcept {
 #ifdef HAVE_OPENMP
 #pragma omp parallel for num_threads(rawspeed_get_number_of_processor_cores()) \
     schedule(static) default(none)
@@ -233,7 +233,7 @@ void PanasonicDecompressorV5::decompressInternal() const noexcept {
   }
 }
 
-void PanasonicDecompressorV5::decompress() const noexcept {
+void PanasonicV5Decompressor::decompress() const noexcept {
   switch (bps) {
   case 12:
     decompressInternal<TwelveBitPacket>();

src/librawspeed/decompressors/PanasonicDecompressorV5.h src/librawspeed/decompressors/PanasonicV5Decompressor.h

@@ -33,7 +33,7 @@
 
 namespace rawspeed {
 
-class PanasonicDecompressorV5 final : public AbstractDecompressor {
+class PanasonicV5Decompressor final : public AbstractDecompressor {
   // The RW2 raw image buffer consists of individual blocks,
   // each one BlockSize bytes in size.
   static constexpr uint32_t BlockSize = 0x4000;
@@ -98,7 +98,7 @@ class PanasonicDecompressorV5 final : public AbstractDecompressor {
   template <const PacketDsc& dsc> void decompressInternal() const noexcept;
 
 public:
-  PanasonicDecompressorV5(const RawImage& img, const ByteStream& input_,
+  PanasonicV5Decompressor(const RawImage& img, const ByteStream& input_,
                           uint32_t bps_);
 
   void decompress() const noexcept;