From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 8 Sep 2020 10:47:39 +0000 (+0000)
Subject: Merge "use modern construct 'nullptr' instead of 'NULL' or '0'" into devel/master
X-Git-Tag: dali_1.9.29~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ed2e43c4376bc77c56be78849cd00434311966e;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge "use modern construct 'nullptr' instead of 'NULL' or '0'" into devel/master
---

3ed2e43c4376bc77c56be78849cd00434311966e
diff --cc dali/internal/event/images/bitmap-packed-pixel.h
index 2ed616caa,9c2ef6992..df39386d4
--- a/dali/internal/event/images/bitmap-packed-pixel.h
+++ b/dali/internal/event/images/bitmap-packed-pixel.h
@@@ -46,11 -46,11 +46,11 @@@ public
     * Constructor
     * @param[in] discardable Flag to tell the bitmap if it can delete the buffer with the pixel data.
     */
-   BitmapPackedPixel( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN, Dali::Integration::PixelBuffer* pixBuf = 0 );
+   BitmapPackedPixel( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN, Dali::Integration::PixelBuffer* pixBuf = nullptr );
  
  public:
 -  virtual const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const { return this; }
 -  virtual Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() { return this; }
 +  const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const override { return this; }
 +  Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() override { return this; }
  
    /**
     * (Re-)Allocate pixel buffer for the Bitmap. Any previously allocated pixel buffer is deleted.