Merge "Fixed string constant spacing for fw/compat with gcc 6.2" into devel/master

[platform/core/uifw/dali-adaptor.git] / adaptors / common / bitmap-loader-impl.h

diff --git a/adaptors/common/bitmap-loader-impl.h b/adaptors/common/bitmap-loader-impl.h
index 143fef1..f328889 100644 (file)
--- a/adaptors/common/bitmap-loader-impl.h
+++ b/adaptors/common/bitmap-loader-impl.h
@@ -74,34 +74,24 @@ public:
   bool IsLoaded();
 
   /**
-   * Get the raw pixel data.
-   * @return The pixel data. Use the GetHeight(), GetWidth(), GetStride() and GetPixelFormat() methods
-   * to decode the data.
+   * @copydoc Dali::BitmapLoader::GetUrl()
    */
-  unsigned char* GetPixelData() const;
+  const std::string& GetUrl() const;
 
   /**
-   * Get the buffer height in pixels
-   * @return the height of the buffer in pixels
+   * @copydoc Dali::BitmapLoader::GetPixelData
    */
-  unsigned int GetImageHeight() const;
-
-  /**
-   * Get the buffer width in pixels
-   * @return the width of the buffer in pixels
-   */
-  unsigned int GetImageWidth() const;
-
-  /**
-   * Get the pixel format of the loaded bitmap.
-   */
-  Pixel::Format GetPixelFormat() const;
+  Dali::PixelData GetPixelData() const;
 
 private:
-  Integration::BitmapResourceType mResourceType;
-  Integration::BitmapPtr mBitmap;
+
+  Dali::PixelData mPixelData;
   const std::string mUrl;
-  bool mIsLoaded;
+  ImageDimensions mSize;
+  FittingMode::Type mFittingMode;
+  SamplingMode::Type mSamplingMode;
+  bool mOrientationCorrection;
+
 };
 
 } // Internal