Skip to content

Update tgfx to resolve build errors with the latest CMake version. #2786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kevingpqi123 wants to merge 1 commit into from
Closed

Update tgfx to resolve build errors with the latest CMake version. #2786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"url": "${PAG_GROUP}/tgfx.git",
"commit": "a10e4ad00529e9124a0594538fe9313a12f49b17",
"commit": "8769f398a089d422124d8f6151c36cf55d20c7d2",
"dir": "third_party/tgfx"
},
{
Expand Down
3 changes: 2 additions & 1 deletion android/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions ios/PAGViewer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@
TargetAttributes = {
F2ED889D1FCBEDF100555707 = {
CreatedOnToolsVersion = 9.1;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -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 = "";
Expand All @@ -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 = "";
Expand All @@ -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 = "";
Expand All @@ -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 = "";
Expand Down
3 changes: 2 additions & 1 deletion src/rendering/utils/LZ4Decoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
};

Expand Down
5 changes: 3 additions & 2 deletions src/rendering/utils/LZ4Encoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
};

Expand All @@ -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
Loading
Loading