Author: lehmi
Date: Wed Sep 23 05:43:16 2026
New Revision: 1938452
Log:
PDFBOX-5660: remove no longer used code
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Wed Sep 23 05:41:52 2026 (r1938451)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Wed Sep 23 05:43:16 2026 (r1938452)
@@ -19,11 +19,6 @@ package org.apache.pdfbox.pdfparser;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
@@ -135,30 +130,6 @@ public class COSParser extends BaseParse
private String password = "";
private String keyAlias = null;
- private static final Charset ALTERNATIVE_CHARSET;
-
- static
- {
- Charset cs;
- String charsetName = "Windows-1252";
- try
- {
- cs = Charset.forName(charsetName);
- }
- catch (IllegalArgumentException | UnsupportedOperationException e)
- {
- cs = StandardCharsets.ISO_8859_1;
- LOG.warn(() -> "Charset is not supported: " + charsetName + ",
falling back to "
- + StandardCharsets.ISO_8859_1.name(), e);
- }
- ALTERNATIVE_CHARSET = cs;
- }
-
- // CharSetDecoders are not threadsafe so not static
- private final CharsetDecoder utf8Decoder =
StandardCharsets.UTF_8.newDecoder()
- .onMalformedInput(CodingErrorAction.REPORT)
- .onUnmappableCharacter(CodingErrorAction.REPORT);
-
/**
* The range within the %%EOF marker will be searched.
* Useful if there are additional characters after %%EOF within the PDF.
@@ -1970,27 +1941,6 @@ public class COSParser extends BaseParse
}
/**
- * Tries to decode the buffer content to an UTF-8 String. If that fails,
tries the alternative Encoding.
- *
- * @param buffer the {@link ByteArrayOutputStream} containing the bytes to
decode
- * @return the decoded String
- */
- private String decodeBuffer(ByteArrayOutputStream buffer)
- {
- try
- {
- return
utf8Decoder.decode(ByteBuffer.wrap(buffer.toByteArray())).toString();
- }
- catch (CharacterCodingException e)
- {
- // some malformed PDFs don't use UTF-8 see PDFBOX-3347
- LOG.debug(() -> "Buffer could not be decoded using
StandardCharsets.UTF_8 - trying "
- + ALTERNATIVE_CHARSET.name(), e);
- return buffer.toString(ALTERNATIVE_CHARSET);
- }
- }
-
- /**
* Returns the object key for the given combination of object and
generation number. The object key from the cross
* reference table/stream will be reused if available. Otherwise, and when
this parser has no document, a newly
* created object key will be returned.
