Merge "[4.0] DALi version 1.2.79" into tizen_4.0

[platform/core/uifw/dali-adaptor.git] / platform-abstractions / tizen / image-loaders / loader-ico.h

diff --git a/platform-abstractions/tizen/image-loaders/loader-ico.h b/platform-abstractions/tizen/image-loaders/loader-ico.h
index d481baf..3d9adb5 100644 (file)
--- a/platform-abstractions/tizen/image-loaders/loader-ico.h
+++ b/platform-abstractions/tizen/image-loaders/loader-ico.h
@@ -2,7 +2,7 @@
 #define __DALI_TIZEN_PLATFORM_LOADER_ICO_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -19,6 +19,7 @@
  */
 
 #include <cstdio>
+#include "image-loader-input.h"
 
 namespace Dali
 {
@@ -27,7 +28,6 @@ namespace Integration
 {
   class Bitmap;
 }
-struct ImageAttributes;
 
 namespace TizenPlatform
 {
@@ -40,10 +40,20 @@ namespace Ico
 const unsigned char MAGIC_BYTE_1 = 0x00;
 const unsigned char MAGIC_BYTE_2 = 0x00;
 }
+/**
+ * @param[in]  input  Information about the input image (including file pointer)
+ * @param[out] bitmap The bitmap class where the decoded image will be stored
+ * @return  true if file decoded successfully, false otherwise
+ */
+bool LoadBitmapFromIco( const ImageLoader::Input& input, Integration::Bitmap& bitmap );
 
-bool LoadBitmapFromIco( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& attributes, const ResourceLoadingClient& client );
-
-bool LoadIcoHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height );
+/**
+ * @param[in]  input  Information about the input image (including file pointer)
+ * @param[out] width of image
+ * @param[out] height of image
+ * @return  true if header loaded successfully, false otherwise
+ */
+bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height );
 
 }