You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/05/16 15:17:55 UTC
[commons-imaging] 10/14: Encapsulate PngChunkText
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 41ac15d585adcedaafeca6023f7b0a83c21fc264
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 16 10:46:14 2023 -0400
Encapsulate PngChunkText
---
.../apache/commons/imaging/formats/png/PngImageParser.java | 2 +-
.../commons/imaging/formats/png/chunks/PngChunkText.java | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index f103510c..5f8d6e79 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -447,7 +447,7 @@ public class PngImageParser extends ImageParser<PngImagingParameters> implement
for (final PngChunk tEXt : tEXts) {
final PngChunkText pngChunktEXt = (PngChunkText) tEXt;
- comments.add(pngChunktEXt.keyword + ": " + pngChunktEXt.text);
+ comments.add(pngChunktEXt.getKeyword() + ": " + pngChunktEXt.getText());
textChunks.add(pngChunktEXt.getContents());
}
for (final PngChunk zTXt : zTXts) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
index b8998da2..c982d70e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
@@ -29,23 +29,18 @@ public class PngChunkText extends PngTextChunk {
private static final Logger LOGGER = Logger.getLogger(PngChunkText.class.getName());
- public final String keyword;
- public final String text;
+ private final String keyword;
+ private final String text;
- public PngChunkText(final int length, final int chunkType, final int crc, final byte[] bytes)
- throws ImagingException {
+ public PngChunkText(final int length, final int chunkType, final int crc, final byte[] bytes) throws ImagingException {
super(length, chunkType, crc, bytes);
final int index = findNull(bytes);
if (index < 0) {
- throw new ImagingException(
- "PNG tEXt chunk keyword is not terminated.");
+ throw new ImagingException("PNG tEXt chunk keyword is not terminated.");
}
-
keyword = new String(bytes, 0, index, StandardCharsets.ISO_8859_1);
-
final int textLength = bytes.length - (index + 1);
text = new String(bytes, index + 1, textLength, StandardCharsets.ISO_8859_1);
-
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("Keyword: " + keyword);
LOGGER.finest("Text: " + text);