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 3995fe9..c8317b2 100644 (file)
--- a/platform-abstractions/slp/resource-loader/loader-bmp.h
+++ b/platform-abstractions/slp/resource-loader/loader-bmp.h
@@ -1,21 +1,22 @@
 #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.
-//
+/*
+ * 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.
+ *
+ */
 
 #include <cstdio>
 
@@ -51,11 +52,12 @@ bool LoadBitmapFromBmp(FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& a
 /**
  * Loads the header of a BMP file and fills in the width and height appropriately.
  * @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]  width   Is set with the width of the image
  * @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, unsigned int &width, unsigned int &height);
+bool LoadBmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height);
 
 } // namespace SlpPlatform