Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "hwui: Fix multiple definitions of NativeFamilyBuilder"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-04 15:24:27 +00:00
committed by Gerrit Code Review
parent 2189f35a66 e537b18e8e
commit 579363b7c4
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/jni/FontFamily.cpp
View File

@@ -44,6 +44,7 @@
namespace android { namespace android {
namespace {
struct NativeFamilyBuilder { struct NativeFamilyBuilder {
NativeFamilyBuilder(uint32_t langId, int variant) NativeFamilyBuilder(uint32_t langId, int variant)
: langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {} : langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {}
@@ -52,6 +53,7 @@ struct NativeFamilyBuilder {
std::vector<std::shared_ptr<minikin::Font>> fonts; std::vector<std::shared_ptr<minikin::Font>> fonts;
std::vector<minikin::FontVariation> axes; std::vector<minikin::FontVariation> axes;
}; };
} // namespace
static inline NativeFamilyBuilder* toNativeBuilder(jlong ptr) { static inline NativeFamilyBuilder* toNativeBuilder(jlong ptr) {
return reinterpret_cast<NativeFamilyBuilder*>(ptr); return reinterpret_cast<NativeFamilyBuilder*>(ptr);

2
libs/hwui/jni/fonts/FontFamily.cpp
View File

@@ -29,9 +29,11 @@
namespace android { namespace android {
namespace {
struct NativeFamilyBuilder { struct NativeFamilyBuilder {
std::vector<std::shared_ptr<minikin::Font>> fonts; std::vector<std::shared_ptr<minikin::Font>> fonts;
}; };
} // namespace
static inline NativeFamilyBuilder* toBuilder(jlong ptr) { static inline NativeFamilyBuilder* toBuilder(jlong ptr) {
return reinterpret_cast<NativeFamilyBuilder*>(ptr); return reinterpret_cast<NativeFamilyBuilder*>(ptr);