-#ifndef __DALI_BITMAP_LOADER_H__
-#define __DALI_BITMAP_LOADER_H__
+#ifndef DALI_BITMAP_LOADER_H
+#define DALI_BITMAP_LOADER_H
/*
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/images/pixel.h>
#include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/images/pixel.h>
+#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/object/base-handle.h>
namespace Dali
/**
* @brief Query whether the image is loaded.
*
- * @reture true if the image is loaded, false otherwise.
+ * @return true if the image is loaded, false otherwise.
*/
bool IsLoaded();
/**
- * Get the raw pixel data.
- * @return The pixel data. Use the GetHeight(), GetWidth(), GetStride() and GetPixelFormat() methods
- * to decode the data.
- */
- unsigned char* GetPixelData() const;
-
- /**
- * Get the buffer height in pixels
- * @return the height of the buffer in pixels
- */
- unsigned int GetImageHeight() const;
-
- /**
- * Get the buffer width in pixels
- * @return the width of the buffer in pixels
+ * @brief Returns the URL of the image.
+ *
+ * @return The URL of the image file.
*/
- unsigned int GetImageWidth() const;
+ std::string GetUrl() const;
/**
- * Get the pixel format of the loaded bitmap.
+ * @brief Get the pixel data.
+ *
+ * The returned pixel data is still valid after the BitmapLoader been destroyed.
+ *
+ * @return The pixel data.
*/
- Pixel::Format GetPixelFormat() const;
+ PixelData GetPixelData() const;
public: // Not intended for application developers
} // Dali
-#endif // __DALI_BITMAP_LOADER_H__
+#endif // DALI_BITMAP_LOADER_H