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
The following commit(s) were added to refs/heads/master by this push:
new 5e53a1f1 Reduce public API footprint (keeping new API)
5e53a1f1 is described below
commit 5e53a1f1aee1577c30f422d345541bc16336672b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed May 24 15:29:37 2023 -0400
Reduce public API footprint (keeping new API)
---
.../apache/commons/imaging/formats/png/PngImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/png/PngWriter.java | 13 -------------
.../commons/imaging/formats/png/PngImageParserTest.java | 2 +-
.../apache/commons/imaging/formats/png/PngWriterTest.java | 14 +++-----------
4 files changed, 5 insertions(+), 26 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 afcc60bd..c006d6ff 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
@@ -734,7 +734,7 @@ public class PngImageParser extends
ImageParser<PngImagingParameters> implement
@Override
public void writeImage(final BufferedImage src, final OutputStream os,
final PngImagingParameters params)
throws ImagingException, IOException {
- new PngWriter().writeImage(src, os, params);
+ new PngWriter().writeImage(src, os, params, null);
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
index 12efd61c..d83610df 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
@@ -322,19 +322,6 @@ public class PngWriter {
zTXt Yes None
*/
- /**
- * Writes an image to an output stream.
- *
- * @param src The image to write.
- * @param os The output stream to write to.
- * @param params The parameters to use (can be {@code NULL} to use the
default parameters).
- * @throws ImagingException When errors are detected.
- * @throws IOException When IO problems occur.
- */
- public void writeImage(final BufferedImage src, final OutputStream os,
final PngImagingParameters params) throws ImagingException, IOException {
- writeImage(src, os, params, new PaletteFactory());
- }
-
/**
* Writes an image to an output stream.
*
diff --git
a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
index 15298173..74f2bfd5 100644
---
a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
@@ -69,7 +69,7 @@ public class PngImageParserTest extends PngBaseTest {
private static byte[] getPngImageBytes(final BufferedImage image, final
PngImagingParameters params) throws IOException {
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- new PngWriter().writeImage(image, os, params);
+ new PngWriter().writeImage(image, os, params, null);
return os.toByteArray();
}
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
index ad759c6b..9ec5040c 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
@@ -42,14 +42,7 @@ public class PngWriterTest extends PngBaseTest {
return new PaletteFactory().makeExactRgbPaletteSimple(imageParsed,
Integer.MAX_VALUE).length();
}
- private static byte[] getImageBytes(final BufferedImage image, final
PngImagingParameters params) throws IOException {
- try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- new PngWriter().writeImage(image, os, params);
- return os.toByteArray();
- }
- }
-
- private static byte[] getImageBytesWithPalette(final BufferedImage image,
final PngImagingParameters params, final PaletteFactory paletteFactory) throws
IOException {
+ private static byte[] getImageBytes(final BufferedImage image, final
PngImagingParameters params, final PaletteFactory paletteFactory) throws
IOException {
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
new PngWriter().writeImage(image, os, params, paletteFactory);
return os.toByteArray();
@@ -59,7 +52,6 @@ public class PngWriterTest extends PngBaseTest {
private List<File> getValidPngImages() throws IOException {
final List<File> result = new ArrayList<>();
for (final File imageFile : getPngImages()) {
-
if (!isInvalidPNGTestFile(imageFile)) {
result.add(imageFile);
}
@@ -89,7 +81,7 @@ public class PngWriterTest extends PngBaseTest {
final PngImagingParameters params = new PngImagingParameters();
params.setForceIndexedColor(true);
- final byte[] bytes = getImageBytes(image, params);
+ final byte[] bytes = getImageBytes(image, params, null);
final int numColors = countColors(bytes);
assertTrue(numColors > 1);
@@ -100,7 +92,7 @@ public class PngWriterTest extends PngBaseTest {
return new SimplePalette(new int[max]);
}
};
- final byte[] palettedBytes = getImageBytesWithPalette(image, params,
factory);
+ final byte[] palettedBytes = getImageBytes(image, params, factory);
assertEquals(1, countColors(palettedBytes));
}
