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 cde518b..f328889 100644 (file)
--- a/adaptors/common/bitmap-loader-impl.h
+++ b/adaptors/common/bitmap-loader-impl.h
@@ -81,12 +81,17 @@ public:
   /**
    * @copydoc Dali::BitmapLoader::GetPixelData
    */
-  PixelDataPtr GetPixelData() const;
+  Dali::PixelData GetPixelData() const;
 
 private:
-  Integration::BitmapResourceType mResourceType;
-  PixelDataPtr mPixelData;
+
+  Dali::PixelData mPixelData;
   const std::string mUrl;
+  ImageDimensions mSize;
+  FittingMode::Type mFittingMode;
+  SamplingMode::Type mSamplingMode;
+  bool mOrientationCorrection;
+
 };
 
 } // Internal