X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fbitmap.h;h=3c600651405825f10abf62a5a15d146c607aa4b7;hb=5fd4f53b09f5bee4ac23c8f4a044a7e329baa195;hp=01b3b4cd02b287164b888122b43c88fbe2345317;hpb=5fab3d3bc329a7a19ec9cf1cac82031ca97af72d;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h index 01b3b4c..3c60065 100644 --- a/dali/integration-api/bitmap.h +++ b/dali/integration-api/bitmap.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_BITMAP_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ namespace Integration * @param[out] pixelDataType pixel data type (eg. GL_UNSIGNED_BYTE) * @param[out] internalFormat pixel internal format (eg. GL_RGBA) */ -DALI_IMPORT_API void ConvertToGlFormat(Pixel::Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat); +DALI_CORE_API void ConvertToGlFormat(Pixel::Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat); class Bitmap; typedef IntrusivePtr BitmapPtr; @@ -49,7 +49,7 @@ typedef unsigned char PixelBuffer; ///< Pixel data buffers are * Bitmap class. * An abstract container for image data. */ -class DALI_IMPORT_API Bitmap : public Dali::RefObject +class DALI_CORE_API Bitmap : public Dali::RefObject { protected: @@ -267,6 +267,13 @@ public: * This property can then be tested for with IsFullyOpaque(). */ virtual void TestForTransparency() = 0; + + protected: + + /** + * Virtual destructor, no deletion through this interface + */ + virtual ~PackedPixelsProfile() {} }; /** @@ -304,6 +311,12 @@ public: const unsigned width, const unsigned height, const size_t numBytes ) = 0; + protected: + + /** + * Virtual destructor, no deletion through this interface + */ + virtual ~CompressedProfile() {} }; virtual const CompressedProfile* GetCompressedProfile() const { return 0; } @@ -331,6 +344,8 @@ public: */ void DeletePixelBuffer(); +protected: + /** * A reference counted object may only be deleted by calling Unreference() */