From 07c10456a3f3d5ad386992a9b4006b0334f7a8ac Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Thu, 27 Oct 2022 07:22:22 +0000 Subject: [PATCH] FOP-3102: Move composite glyphs to the end git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1904868 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/fop/fonts/truetype/GlyfTable.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fop-core/src/main/java/org/apache/fop/fonts/truetype/GlyfTable.java b/fop-core/src/main/java/org/apache/fop/fonts/truetype/GlyfTable.java index 6ad479a0e..c5380b82e 100644 --- a/fop-core/src/main/java/org/apache/fop/fonts/truetype/GlyfTable.java +++ b/fop-core/src/main/java/org/apache/fop/fonts/truetype/GlyfTable.java @@ -42,7 +42,7 @@ public class GlyfTable { private final FontFileReader in; /** All the composite glyphs that appear in the subset. */ - private Set compositeGlyphs = new TreeSet(); + protected Set compositeGlyphs = new TreeSet(); /** All the glyphs that are composed, but do not appear in the subset. */ protected Set composedGlyphs = new TreeSet(); @@ -56,7 +56,7 @@ public class GlyfTable { this.in = in; } - private static enum GlyfFlags { + public enum GlyfFlags { ARG_1_AND_2_ARE_WORDS(4, 2), ARGS_ARE_XY_VALUES, @@ -96,7 +96,7 @@ public class GlyfTable { * @param flags the glyph data flags * @return offset to the next glyph if any, or 0 */ - static int getOffsetToNextComposedGlyf(int flags) { + public static int getOffsetToNextComposedGlyf(int flags) { int offset = 0; for (GlyfFlags flag : GlyfFlags.values()) { offset += (flags & flag.bitMask) > 0 ? flag.argsCountIfSet : flag.argsCountIfNotSet; @@ -110,7 +110,7 @@ public class GlyfTable { * @param flags the glyph data flags * @return true if there is another composed glyph, otherwise false. */ - static boolean hasMoreComposites(int flags) { + public static boolean hasMoreComposites(int flags) { return (flags & MORE_COMPONENTS.bitMask) > 0; } } -- 2.39.5