Update tgfx to resolve build errors with the latest CMake version. (#2782)

domchen · web-flow · commit d923913bf897 · 2025-04-23T18:59:01.000+08:00
diff --git a/DEPS b/DEPS
@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "a10e4ad00529e9124a0594538fe9313a12f49b17",
+        "commit": "fe9b7e978124036da10b11d294496f410ac6d39f",
         "dir": "third_party/tgfx"
       },
       {
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
diff --git a/ios/PAGViewer.xcodeproj/project.pbxproj b/ios/PAGViewer.xcodeproj/project.pbxproj
@@ -352,7 +352,6 @@
 				TargetAttributes = {
 					F2ED889D1FCBEDF100555707 = {
 						CreatedOnToolsVersion = 9.1;
-						ProvisioningStyle = Manual;
 					};
 				};
 			};
@@ -611,8 +610,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMPRESS_PNG_FILES = YES;
 				DEVELOPMENT_TEAM = 36588GHG2N;
 				EXPORTED_SYMBOLS_FILE = "";
@@ -631,7 +630,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = io.pag.viewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = PAG_Development;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_PNG_TEXT = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -644,8 +643,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMPRESS_PNG_FILES = YES;
 				DEVELOPMENT_TEAM = 36588GHG2N;
 				EXPORTED_SYMBOLS_FILE = "";
@@ -664,7 +663,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = io.pag.viewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = PAG_Development;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_PNG_TEXT = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
diff --git a/src/rendering/utils/LZ4Decoder.cpp b/src/rendering/utils/LZ4Decoder.cpp
@@ -60,7 +60,8 @@ class DefaultLZ4Decoder : public LZ4Decoder {
   size_t decode(uint8_t* dstBuffer, size_t dstSize, const uint8_t* srcBuffer,
                 size_t srcSize) const override {
     return LZ4_decompress_safe(reinterpret_cast<const char*>(srcBuffer),
-                               reinterpret_cast<char*>(dstBuffer), srcSize, dstSize);
+                               reinterpret_cast<char*>(dstBuffer), static_cast<int>(srcSize),
+                               static_cast<int>(dstSize));
   }
 };
 
diff --git a/src/rendering/utils/LZ4Encoder.cpp b/src/rendering/utils/LZ4Encoder.cpp
@@ -63,7 +63,8 @@ class DefaultLZ4Encoder : public LZ4Encoder {
   size_t encode(uint8_t* dstBuffer, size_t dstSize, const uint8_t* srcBuffer,
                 size_t srcSize) const override {
     return LZ4_compress_default(reinterpret_cast<const char*>(srcBuffer),
-                                reinterpret_cast<char*>(dstBuffer), srcSize, dstSize);
+                                reinterpret_cast<char*>(dstBuffer), static_cast<int>(srcSize),
+                                static_cast<int>(dstSize));
   }
 };
 
@@ -72,7 +73,7 @@ std::unique_ptr<LZ4Encoder> LZ4Encoder::Make() {
 }
 
 size_t LZ4Encoder::GetMaxOutputSize(size_t inputSize) {
-  return LZ4_compressBound(inputSize);
+  return LZ4_compressBound(static_cast<int>(inputSize));
 }
 #endif
 }  // namespace pag
diff --git a/test/baseline/version.json b/test/baseline/version.json

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"url": "${PAG_GROUP}/tgfx.git",`
`15`		`- "commit": "a10e4ad00529e9124a0594538fe9313a12f49b17",`
	`15`	`+ "commit": "fe9b7e978124036da10b11d294496f410ac6d39f",`
`16`	`16`	`"dir": "third_party/tgfx"`
`17`	`17`	`},`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ class DefaultLZ4Decoder : public LZ4Decoder {`
`60`	`60`	`size_t decode(uint8_t* dstBuffer, size_t dstSize, const uint8_t* srcBuffer,`
`61`	`61`	`size_t srcSize) const override {`
`62`	`62`	`return LZ4_decompress_safe(reinterpret_cast<const char*>(srcBuffer),`
`63`		`- reinterpret_cast<char*>(dstBuffer), srcSize, dstSize);`
	`63`	`+ reinterpret_cast<char*>(dstBuffer), static_cast<int>(srcSize),`
	`64`	`+ static_cast<int>(dstSize));`
`64`	`65`	`}`
`65`	`66`	`};`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ class DefaultLZ4Encoder : public LZ4Encoder {`
`63`	`63`	`size_t encode(uint8_t* dstBuffer, size_t dstSize, const uint8_t* srcBuffer,`
`64`	`64`	`size_t srcSize) const override {`
`65`	`65`	`return LZ4_compress_default(reinterpret_cast<const char*>(srcBuffer),`
`66`		`- reinterpret_cast<char*>(dstBuffer), srcSize, dstSize);`
	`66`	`+ reinterpret_cast<char*>(dstBuffer), static_cast<int>(srcSize),`
	`67`	`+ static_cast<int>(dstSize));`
`67`	`68`	`}`
`68`	`69`	`};`
`69`	`70`
`@@ -72,7 +73,7 @@ std::unique_ptr<LZ4Encoder> LZ4Encoder::Make() {`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`size_t LZ4Encoder::GetMaxOutputSize(size_t inputSize) {`
`75`		`- return LZ4_compressBound(inputSize);`
	`76`	`+ return LZ4_compressBound(static_cast<int>(inputSize));`
`76`	`77`	`}`
`77`	`78`	`#endif`
`78`	`79`	`} // namespace pag`