82 add unicode layer name support

CMakeLists.txt

@@ -57,6 +57,8 @@ target_include_directories(doctest INTERFACE thirdparty/doctest/doctest)
 
 # Add simdutf for UTF conversion operations
 set (SIMDUTF_TESTS OFF)
+set (SIMDUTF_TOOLS OFF)
+set (SIMDUTF_ICONV OFF)
 add_subdirectory (thirdparty/simdutf)
 
 # Add span from tcb for compatibility with older compilers for python bindings

PhotoshopAPI/src/Core/Struct/PascalString.h

@@ -338,22 +338,12 @@ inline static std::string convertStrToUTF8(EncodingType encoding, const std::str
 }
 
 
-/// Convert a utf-8 encoded string to another encoding. For the moment we simply map the ascii
-/// characters and ignore any special character
+/// Convert a utf-8 encoded string to another encoding. For the moment we simply parse the data through as is
 // ---------------------------------------------------------------------------------------------------------------------
 // ---------------------------------------------------------------------------------------------------------------------
 inline static std::string ConvertUTF8ToStr(EncodingType encoding, const std::string str)
 {
-    PROFILE_FUNCTION();
-    std::string res = "";
-    for (const auto& character : str)
-    {
-        if (character < 0x80)
-        {
-            res += character;
-        }
-    }
-    return res;
+    return str;
 }
 
 

PhotoshopTest/src/TestUnicodeLayerNames/TestUnicodeLayerNames.cpp

@@ -19,7 +19,12 @@ TEST_CASE("Read Unicode layer name from psd file")
 
 	LayeredFile<bpp8_t> layeredFile = LayeredFile<bpp8_t>::read(psd_path);
 
-	// Find the two layers by their names and check if the result is not null
+	// Find the three layers by their names and check if the result is not null
+	SUBCASE("Find chinese simplified layer")
+	{
+		auto ptr = layeredFile.findLayer("Chinese_Simplified/请问可以修改psd 的画板尺寸吗");
+		CHECK(ptr);
+	}
 	SUBCASE("Find overflow layer")
 	{
 		auto ptr = layeredFile.findLayer("äüöUnicodeNameOverflowPascalString--------------------------------------------------------------------------------------------------------------------");
@@ -44,7 +49,12 @@ TEST_CASE("Read Unicode layer name from psb file")
 
 	LayeredFile<bpp8_t> layeredFile = LayeredFile<bpp8_t>::read(psb_path);
 
-	// Find the two layers by their names and check if the result is not null
+	// Find the three layers by their names and check if the result is not null
+	SUBCASE("Find chinese simplified layer")
+	{
+		auto ptr = layeredFile.findLayer("Chinese_Simplified/请问可以修改psd 的画板尺寸吗");
+		CHECK(ptr);
+	}
 	SUBCASE("Find overflow layer")
 	{
 		auto ptr = layeredFile.findLayer("äüöUnicodeNameOverflowPascalString--------------------------------------------------------------------------------------------------------------------");
@@ -74,7 +84,12 @@ TEST_CASE("Read write unicode layer name from psd file")
 	LayeredFile<bpp8_t> layeredFile = LayeredFile<bpp8_t>::read(psd_path);
 
 
-	// Find the two layers by their names and check if the result is not null
+	// Find the three layers by their names and check if the result is not null
+	SUBCASE("Find chinese simplified layer")
+	{
+		auto ptr = layeredFile.findLayer("Chinese_Simplified/请问可以修改psd 的画板尺寸吗");
+		CHECK(ptr);
+	}
 	SUBCASE("Find overflow layer")
 	{
 		auto ptr = layeredFile.findLayer("äüöUnicodeNameOverflowPascalString--------------------------------------------------------------------------------------------------------------------");
@@ -104,7 +119,12 @@ TEST_CASE("Read write unicode layer name from psb file")
 	LayeredFile<bpp8_t> layeredFile = LayeredFile<bpp8_t>::read(psb_path);
 
 
-	// Find the two layers by their names and check if the result is not null
+	// Find the three layers by their names and check if the result is not null
+	SUBCASE("Find chinese simplified layer")
+	{
+		auto ptr = layeredFile.findLayer("Chinese_Simplified/请问可以修改psd 的画板尺寸吗");
+		CHECK(ptr);
+	}
 	SUBCASE("Find overflow layer")
 	{
 		auto ptr = layeredFile.findLayer("äüöUnicodeNameOverflowPascalString--------------------------------------------------------------------------------------------------------------------");

python/CMakeLists.txt

@@ -4,5 +4,8 @@ project(PhotoshopAPIPython)
 
 file(GLOB_RECURSE MY_SOURCES CONFIGURE_DEPENDS "src/*.cpp")
 
+# Compile simdutf with position independent code as it otherwise wont compile on gcc ubuntu
+set_property(TARGET simdutf PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 pybind11_add_module(psapi src/main.cpp)
 target_link_libraries(psapi PUBLIC PhotoshopAPI)