refactored RawImageData reference counting

using shared_ptr instead of RawImage, also not all places require reference counting

Author: maruncz

fuzz/librawspeed/decompressors/Cr2Decompressor.cpp

@@ -39,7 +39,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     using slice_type = uint16_t;
     const auto numSlices = bs.get<slice_type>();
@@ -48,7 +48,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
 
     const rawspeed::Cr2Slicing slicing(numSlices, sliceWidth, lastSliceWidth);
 
-    rawspeed::Cr2Decompressor c(bs, mRaw);
+    rawspeed::Cr2Decompressor c(bs, mRaw.get());
     mRaw->createData();
     c.decode(slicing);
 

fuzz/librawspeed/decompressors/CrwDecompressor.cpp

@@ -39,12 +39,12 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const uint32_t dec_table = bs.getU32();
     const uint32_t lowbits = bs.getU32();
 
-    rawspeed::CrwDecompressor c(mRaw, dec_table, lowbits,
+    rawspeed::CrwDecompressor c(mRaw.get(), dec_table, lowbits,
                                 bs.getStream(bs.getRemainSize()));
     mRaw->createData();
     c.decompress();

fuzz/librawspeed/decompressors/DummyLJpegDecompressor.cpp

@@ -39,7 +39,7 @@ class DummyLJpegDecompressor final
 
 public:
   DummyLJpegDecompressor(const rawspeed::ByteStream& bs,
-                         const rawspeed::RawImage& img)
+                         rawspeed::RawImageData* img)
       : AbstractLJpegDecompressor(bs, img) {}
 
   void decode() { AbstractLJpegDecompressor::decode(); }
@@ -55,9 +55,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
-    DummyLJpegDecompressor d(bs, mRaw);
+    DummyLJpegDecompressor d(bs, mRaw.get());
     d.decode();
     mRaw->createData();
 

fuzz/librawspeed/decompressors/FujiDecompressor.cpp

@@ -39,10 +39,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
     mRaw->cfa = CreateCFA(bs);
 
-    rawspeed::FujiDecompressor f(mRaw, bs.getStream(bs.getRemainSize()));
+    rawspeed::FujiDecompressor f(mRaw.get(), bs.getStream(bs.getRemainSize()));
     mRaw->createData();
     f.decompress();
 

fuzz/librawspeed/decompressors/HasselbladDecompressor.cpp

@@ -39,11 +39,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const auto pixelBaseOffset = bs.get<int>();
 
-    rawspeed::HasselbladDecompressor h(bs, mRaw);
+    rawspeed::HasselbladDecompressor h(bs, mRaw.get());
     mRaw->createData();
     h.decode(pixelBaseOffset);
 

fuzz/librawspeed/decompressors/KodakDecompressor.cpp

@@ -39,13 +39,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const bool bps = bs.getU32();
     const bool uncorrectedRawValues = bs.getU32();
 
-    rawspeed::KodakDecompressor k(mRaw, bs.getStream(bs.getRemainSize()), bps,
-                                  uncorrectedRawValues);
+    rawspeed::KodakDecompressor k(mRaw.get(), bs.getStream(bs.getRemainSize()),
+                                  bps, uncorrectedRawValues);
 
     mRaw->createData();
 

fuzz/librawspeed/decompressors/LJpegDecompressor.cpp

@@ -39,15 +39,15 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const auto offsetX = bs.getU32();
     const auto offsetY = bs.getU32();
     const auto width = bs.getU32();
     const auto height = bs.getU32();
     const auto fixDng16Bug = bs.getU32();
 
-    rawspeed::LJpegDecompressor j(bs, mRaw);
+    rawspeed::LJpegDecompressor j(bs, mRaw.get());
     mRaw->createData();
     j.decode(offsetX, offsetY, width, height, fixDng16Bug);
 

fuzz/librawspeed/decompressors/NikonDecompressor.cpp

@@ -39,15 +39,15 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const auto bitsPS = bs.get<uint32_t>();
     const auto uncorrectedRawValues = bs.get<uint32_t>();
     const auto medataLength = bs.get<uint32_t>();
     rawspeed::ByteStream metaData = bs.getStream(medataLength);
     rawspeed::ByteStream rawData = bs.getStream(bs.getRemainSize());
 
-    rawspeed::NikonDecompressor n(mRaw, metaData, bitsPS);
+    rawspeed::NikonDecompressor n(mRaw.get(), metaData, bitsPS);
     mRaw->createData();
     n.decompress(rawData, uncorrectedRawValues);
 

fuzz/librawspeed/decompressors/OlympusDecompressor.cpp

@@ -39,9 +39,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
-    rawspeed::OlympusDecompressor o(mRaw);
+    rawspeed::OlympusDecompressor o(mRaw.get());
 
     mRaw->createData();
 

fuzz/librawspeed/decompressors/PanasonicDecompressorV4.cpp

@@ -39,13 +39,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     const rawspeed::DataBuffer db(b, rawspeed::Endianness::little);
     rawspeed::ByteStream bs(db);
 
-    rawspeed::RawImage mRaw(CreateRawImage(bs));
+    auto mRaw(CreateRawImage(bs));
 
     const auto zero_is_not_bad = bs.get<uint32_t>();
     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::PanasonicDecompressorV4 p(mRaw.get(), rawData, zero_is_not_bad,
                                         section_split_offset);
     mRaw->createData();
     p.decompress();