Author: tilman
Date: Sat Jul 4 12:02:14 2026
New Revision: 1935876
Log:
PDFBOX-4951: reorder
Modified:
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutFontLoaderAwt.java
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutProcessorAwt.java
Modified:
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutFontLoaderAwt.java
==============================================================================
---
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutFontLoaderAwt.java
Sat Jul 4 11:51:53 2026 (r1935875)
+++
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutFontLoaderAwt.java
Sat Jul 4 12:02:14 2026 (r1935876)
@@ -53,16 +53,14 @@ public class GlyphLayoutFontLoaderAwt
*
* @param pdDocument document
* @param inputStream of the font
- * @param embedSubset True if the font will be subset before embedding.
Set this to false when
- * creating a font for AcroForm.
* @return pdType0Font PDFBox font
* @throws IOException if font can not be loaded
* @throws FontFormatException if the font is bad
*/
- public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset)
+ public PDType0Font loadFont(PDDocument pdDocument, InputStream inputStream)
throws IOException, FontFormatException
{
- return loadFont(pdDocument, inputStream, embedSubset, null);
+ return loadFont(pdDocument, inputStream, true, null);
}
/**
@@ -70,14 +68,16 @@ public class GlyphLayoutFontLoaderAwt
*
* @param pdDocument document
* @param inputStream of the font
+ * @param embedSubset True if the font will be subset before embedding.
Set this to false when
+ * creating a font for AcroForm.
* @return pdType0Font PDFBox font
* @throws IOException if font can not be loaded
* @throws FontFormatException if the font is bad
*/
- public PDType0Font loadFont(PDDocument pdDocument, InputStream inputStream)
+ public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset)
throws IOException, FontFormatException
{
- return loadFont(pdDocument, inputStream, true, null);
+ return loadFont(pdDocument, inputStream, embedSubset, null);
}
/**
Modified:
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutProcessorAwt.java
==============================================================================
---
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutProcessorAwt.java
Sat Jul 4 11:51:53 2026 (r1935875)
+++
pdfbox/trunk/pdfbox-layout-awt/src/main/java/org/apache/pdfbox/glyphlayout/GlyphLayoutProcessorAwt.java
Sat Jul 4 12:02:14 2026 (r1935876)
@@ -110,18 +110,15 @@ public class GlyphLayoutProcessorAwt imp
*
* @param pdDocument document
* @param inputStream of the font
- * @param embedSubset must be false for PDF forms
- * @param fontOptions options for font
*
* @return a PDType0Font font.
- *
+ *
* @throws IOException if font can not be loaded
* @throws FontFormatException if the font is bad
*/
- public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset,
- GlyphLayoutFontLoaderAwt.FontOptions fontOptions) throws
IOException, FontFormatException
+ public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream) throws IOException, FontFormatException
{
- return glyphLayoutFontLoaderAwt.loadFont(pdDocument, inputStream,
embedSubset, fontOptions);
+ return glyphLayoutFontLoaderAwt.loadFont(pdDocument, inputStream,
true);
}
/**
@@ -136,7 +133,8 @@ public class GlyphLayoutProcessorAwt imp
* @throws IOException if font can not be loaded
* @throws FontFormatException if the font is bad
*/
- public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset) throws IOException, FontFormatException
+ public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset)
+ throws IOException, FontFormatException
{
return glyphLayoutFontLoaderAwt.loadFont(pdDocument, inputStream,
embedSubset);
}
@@ -164,15 +162,18 @@ public class GlyphLayoutProcessorAwt imp
*
* @param pdDocument document
* @param inputStream of the font
+ * @param embedSubset must be false for PDF forms
+ * @param fontOptions options for font
*
* @return a PDType0Font font.
- *
+ *
* @throws IOException if font can not be loaded
* @throws FontFormatException if the font is bad
*/
- public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream) throws IOException, FontFormatException
+ public PDType0Font loadFont(PDDocument pdDocument, InputStream
inputStream, boolean embedSubset,
+ GlyphLayoutFontLoaderAwt.FontOptions fontOptions) throws
IOException, FontFormatException
{
- return glyphLayoutFontLoaderAwt.loadFont(pdDocument, inputStream,
true);
+ return glyphLayoutFontLoaderAwt.loadFont(pdDocument, inputStream,
embedSubset, fontOptions);
}
/**