Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-platform-abstraction.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index 5c70e97..fb66434 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TEST_PLATFORM_ABSTRACTION_H__
 #define __DALI_TEST_PLATFORM_ABSTRACTION_H__
 
 #ifndef __DALI_TEST_PLATFORM_ABSTRACTION_H__
 #define __DALI_TEST_PLATFORM_ABSTRACTION_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.
+ *
+ */

 
 // EXTERNAL INCLUDES
 #include <set>
 
 // EXTERNAL INCLUDES
 #include <set>


@@ -152,7 +153,7 @@ public:
    */
   virtual Integration::GlyphSet* GetGlyphData ( const Integration::TextResourceType& textRequest,
                                                 const std::string& fontFamily,
    */
   virtual Integration::GlyphSet* GetGlyphData ( const Integration::TextResourceType& textRequest,
                                                 const std::string& fontFamily,

-                                                bool getImageData ) const;
+                                                bool getBitmap) const;

 
   /**
    * @copydoc PlatformAbstraction::GetCachedGlyphData()
 
   /**
    * @copydoc PlatformAbstraction::GetCachedGlyphData()


@@ -233,7 +234,7 @@ public:
   virtual void GetFileNamesFromDirectory( const std::string& directoryName,
                                           std::vector<std::string>& fileNames );
 
   virtual void GetFileNamesFromDirectory( const std::string& directoryName,
                                           std::vector<std::string>& fileNames );
 

-  virtual Integration::ImageDataPtr GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const;
+  virtual Integration::BitmapPtr GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const;

 
 public: // TEST FUNCTIONS
 
 
 public: // TEST FUNCTIONS