RawImageData reference counting delegated to shared_ptr

Author: maruncz

.gitignore

@@ -13,6 +13,7 @@ cscope.out
 *.vcproj
 *.vcxproj
 .vscode/
+CMakeLists.txt.user
 
 # Compiled Object files
 *.slo

src/librawspeed/common/RawImage.cpp

@@ -57,7 +57,6 @@ RawImageData::RawImageData(const iPoint2D& _dim, int _bpc, int _cpp)
 }
 
 RawImageData::~RawImageData() {
-  assert(dataRefCount == 0);
   mOffset = iPoint2D(0, 0);
 
   destroyData();
@@ -282,28 +281,14 @@ void RawImageData::createBadPixelMap()
 }
 
 RawImage::RawImage(RawImageData* p) : p_(p) {
-  MutexLocker guard(&p_->mymutex);
-  ++p_->dataRefCount;
+
 }
 
 RawImage::RawImage(const RawImage& p) : p_(p.p_) {
-  MutexLocker guard(&p_->mymutex);
-  ++p_->dataRefCount;
-}
 
-RawImage::~RawImage() {
-  p_->mymutex.Lock();
+}
 
-  --p_->dataRefCount;
 
-  if (p_->dataRefCount == 0) {
-    p_->mymutex.Unlock();
-    delete p_;
-    return;
-  }
-
-  p_->mymutex.Unlock();
-}
 
 void RawImageData::transferBadPixelsToMap()
 {

src/librawspeed/common/RawImage.h

@@ -172,8 +172,6 @@ class RawImageData : public ErrorLog {
   Mutex mBadPixelMutex; // Mutex for 'mBadPixelPositions, must be used if more
                         // than 1 thread is accessing vector
 
-private:
-  uint32_t dataRefCount GUARDED_BY(mymutex) = 0;
 
 protected:
   RawImageType dataType;
@@ -191,7 +189,6 @@ class RawImageData : public ErrorLog {
   iPoint2D mOffset;
   iPoint2D uncropped_dim;
   std::unique_ptr<TableLookUp> table;
-  Mutex mymutex;
 };
 
 class RawImageDataU16 final : public RawImageData {
@@ -235,17 +232,16 @@ class RawImageDataFloat final : public RawImageData {
    static RawImage create(const iPoint2D& dim,
                           RawImageType type = RawImageType::UINT16,
                           uint32_t componentsPerPixel = 1);
-   RawImageData* operator->() const { return p_; }
-   RawImageData& operator*() const { return *p_; }
+   RawImageData* operator->() const { return p_.operator->(); }
+   RawImageData& operator*() const { return p_.operator*(); }
    explicit RawImage(RawImageData* p); // p must not be NULL
-   ~RawImage();
    RawImage(const RawImage& p);
    RawImage& operator=(const RawImage& p) noexcept;
    RawImage& operator=(RawImage&& p) noexcept;
 
-   RawImageData* get() { return p_; }
+   RawImageData* get() { return p_.get(); }
  private:
-   RawImageData* p_;    // p_ is never NULL
+   std::shared_ptr<RawImageData> p_;    // p_ is never NULL
  };
 
 inline RawImage RawImage::create(RawImageType type)  {