Merge branch 'tizen' into new_text

[platform/core/uifw/dali-core.git] / dali / internal / event / text / resource / glyph-resource-manager.h

diff --git a/dali/internal/event/text/resource/glyph-resource-manager.h b/dali/internal/event/text/resource/glyph-resource-manager.h
index 916b3f1..a155b9f 100644 (file)
--- a/dali/internal/event/text/resource/glyph-resource-manager.h
+++ b/dali/internal/event/text/resource/glyph-resource-manager.h
@@ -1,26 +1,26 @@
 #ifndef __DALI_INTERNAL_GLYPH_RESOURCE_MANAGER_H__
 #define __DALI_INTERNAL_GLYPH_RESOURCE_MANAGER_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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/event/text/glyph-status/glyph-status.h>
 #include <dali/internal/event/text/resource/glyph-resource-observer.h>
 #include <dali/internal/event/text/resource/glyph-resource-request.h>
@@ -31,9 +31,6 @@
 #include <dali/internal/event/resources/resource-ticket.h>
 #include <dali/integration-api/resource-cache.h>
 
-// EXTERNAL INCLUDES
-#include <set>
-
 namespace Dali
 {