License conversion from Flora to Apache 2.0

[platform/core/uifw/dali-adaptor.git] / platform-abstractions / slp / resource-loader / loader-bmp.h

diff --git a/platform-abstractions/slp/resource-loader/loader-bmp.h b/platform-abstractions/slp/resource-loader/loader-bmp.h
index 74b0cde..c8317b2 100644 (file)
--- a/platform-abstractions/slp/resource-loader/loader-bmp.h
+++ b/platform-abstractions/slp/resource-loader/loader-bmp.h
@@ -1,26 +1,23 @@
 #ifndef __DALI_SLP_PLATFORM_LOADER_BMP_H__
 #define __DALI_SLP_PLATFORM_LOADER_BMP_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/intrusive-ptr.h>
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
-// EXTERNAL INCLUDES
 #include <cstdio>
 
 namespace Dali
@@ -28,8 +25,7 @@ namespace Dali
 
 namespace Integration
 {
-class ImageData;
-typedef IntrusivePtr<ImageData> ImageDataPtr;
+  class Bitmap;
 }
 
 struct ImageAttributes;
@@ -47,13 +43,11 @@ const unsigned char MAGIC_BYTE_2 = 0x4D;
  * Loads the bitmap from an BMP file.  This function checks the header first
  * and if it is not a BMP file, then it returns straight away.
  * @param[in]  fp      Pointer to the Image file
- * @param[in]  attributes  Describes the dimensions, pixel format and other
- * details for loading the image data
- * @param[out] bitmap An ImageData smart pointer to be assigned a new class
- * instance in which the image pixels and metadata will be stored
+ * @param[in]  bitmap  The bitmap class where the decoded image will be stored
+ * @param[in]  attributes  Describes the dimensions, pixel format and other details for loading the image data
  * @return  true if file decoded successfully, false otherwise
  */
-bool LoadBitmapFromBmp( FILE *fp, ImageAttributes& attributes, Integration::ImageDataPtr& bitmap );
+bool LoadBitmapFromBmp(FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& attributes);
 
 /**
  * Loads the header of a BMP file and fills in the width and height appropriately.
@@ -63,7 +57,7 @@ bool LoadBitmapFromBmp( FILE *fp, ImageAttributes& attributes, Integration::Imag
  * @param[out]  height  Is set with the height of the image
  * @return true if the file's header was read successully, false otherwise
  */
-bool LoadBmpHeader( FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height );
+bool LoadBmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height);
 
 } // namespace SlpPlatform