[dali_2.3.26] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / internal / loader / json-reader.h

diff --git a/dali-scene3d/internal/loader/json-reader.h b/dali-scene3d/internal/loader/json-reader.h
index c0a8abd..45e4e42 100644 (file)
--- a/dali-scene3d/internal/loader/json-reader.h
+++ b/dali-scene3d/internal/loader/json-reader.h
@@ -1,7 +1,7 @@
 #ifndef DALI_SCENE3D_LOADER_JSON_READER_H_
 #define DALI_SCENE3D_LOADER_JSON_READER_H_
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -17,17 +17,17 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include "dali-scene3d/third-party/json.h"
-
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <algorithm>
 #include <cstring>
 #include <map>
 #include <memory>
 #include <sstream>
 #include <string_view>
-#include "dali/public-api/common/vector-wrapper.h"
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/third-party/json.h> // TODO : Since license issue, We shoud replace this thing as <dali-toolkit/devel-api/builder/json-parser.h>
 
 namespace json
 {
@@ -170,10 +170,15 @@ struct Read
     return static_cast<E>(number);
   }
 
+  static std::string_view StringView(const json_string_s& js)
+  {
+    return std::string_view(js.string, js.string_size);
+  }
+
   static std::string_view StringView(const json_value_s& j)
   {
     auto& js = Cast<json_string_s>(j);
-    return std::string_view(js.string, js.string_size);
+    return StringView(js);
   }
 
   static std::string String(const json_value_s& j)