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/06/01 00:32:48 UTC
[commons-imaging] branch master updated (06c0cc88 -> 7f9f238e)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
from 06c0cc88 Make String descriptions consistent and simple
new fe442c7b Use camel-case
new b209d85b Use camel-case
new 7f9f238e Use camel-case
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/commons/imaging/formats/ico/IcoImageParser.java | 6 +++---
.../apache/commons/imaging/formats/png/ScanExpediterInterlaced.java | 4 ++--
src/test/java/org/apache/commons/imaging/ImagingTest.java | 2 +-
.../org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/png/PngReadTest.java | 2 +-
.../commons/imaging/formats/png/PngWriteForceTrueColorText.java | 2 +-
.../java/org/apache/commons/imaging/formats/png/PngWriterTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
[commons-imaging] 03/03: Use camel-case
Posted by gg...@apache.org.
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 7f9f238e4be5e4c6e0efbc5b12a6f40a872bda14
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 31 20:27:51 2023 -0400
Use camel-case
---
.../apache/commons/imaging/formats/png/ScanExpediterInterlaced.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
index f80d858c..b65fdbe0 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
@@ -35,11 +35,11 @@ class ScanExpediterInterlaced extends ScanExpediter {
ScanExpediterInterlaced(final int width, final int height, final InputStream is,
final BufferedImage bi,
final PngColorType pngColorType, final int bitDepth, final int bitsPerPixel,
- final PngChunkPlte fPNGChunkPLTE,
+ final PngChunkPlte pngChunkPLTE,
final GammaCorrection gammaCorrection,
final TransparencyFilter transparencyFilter) {
super(width, height, is, bi, pngColorType, bitDepth, bitsPerPixel,
- fPNGChunkPLTE, gammaCorrection, transparencyFilter);
+ pngChunkPLTE, gammaCorrection, transparencyFilter);
}
@Override
[commons-imaging] 02/03: Use camel-case
Posted by gg...@apache.org.
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 b209d85b193ee0b4d9d44402fb212316be3cb1af
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 31 20:24:55 2023 -0400
Use camel-case
---
.../java/org/apache/commons/imaging/formats/ico/IcoImageParser.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
index f736b99d..c2a9b90e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
@@ -209,10 +209,10 @@ public class IcoImageParser extends ImageParser<IcoImagingParameters> {
}
}
- private static class PNGIconData extends IconData {
+ private static class PngIconData extends IconData {
public final BufferedImage bufferedImage;
- PNGIconData(final IconInfo iconInfo,
+ PngIconData(final IconInfo iconInfo,
final BufferedImage bufferedImage) {
super(iconInfo);
this.bufferedImage = bufferedImage;
@@ -547,7 +547,7 @@ public class IcoImageParser extends ImageParser<IcoImagingParameters> {
final ImageFormat imageFormat = Imaging.guessFormat(iconData);
if (imageFormat.equals(ImageFormats.PNG)) {
final BufferedImage bufferedImage = Imaging.getBufferedImage(iconData);
- return new PNGIconData(fIconInfo, bufferedImage);
+ return new PngIconData(fIconInfo, bufferedImage);
}
return readBitmapIconData(iconData, fIconInfo);
}
[commons-imaging] 01/03: Use camel-case
Posted by gg...@apache.org.
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 fe442c7bdbb26c147900e9922a63fd72b69a9383
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 31 20:23:53 2023 -0400
Use camel-case
---
src/test/java/org/apache/commons/imaging/ImagingTest.java | 2 +-
.../org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java | 2 +-
src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java | 2 +-
.../apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java | 2 +-
src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java | 2 +-
src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java | 2 +-
src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTest.java b/src/test/java/org/apache/commons/imaging/ImagingTest.java
index 84d9a7a6..0ecbaccb 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingTest.java
@@ -110,7 +110,7 @@ public abstract class ImagingTest {
return getTestImage(file -> file.getName().equals(fileName));
}
- protected boolean isInvalidPNGTestFile(final File file) {
+ protected boolean isInvalidPngTestFile(final File file) {
return (file.getParentFile().getName().equalsIgnoreCase("pngsuite") &&
file.getName().toLowerCase().startsWith("x"));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
index 4dd86df7..7bd6bc15 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
@@ -37,7 +37,7 @@ public class ConvertPngToGifTest extends PngBaseTest {
final List<File> images = getPngImages();
for (final File imageFile : images) {
- if (isInvalidPNGTestFile(imageFile))
+ if (isInvalidPngTestFile(imageFile))
{
continue;
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
index 3d7388af..f6d8f06a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
@@ -46,7 +46,7 @@ public class PngReadTest extends PngBaseTest {
for (final File imageFile : images) {
Debug.debug("imageFile", imageFile);
- if (isInvalidPNGTestFile(imageFile)) {
+ if (isInvalidPngTestFile(imageFile)) {
assertThrows(
Exception.class,
() -> Imaging.getMetadata(imageFile),
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
index 0e8b220c..78186cf6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
@@ -36,7 +36,7 @@ public class PngWriteForceTrueColorText extends PngBaseTest {
for (final File imageFile : images) {
try {
- if (isInvalidPNGTestFile(imageFile)) {
+ if (isInvalidPngTestFile(imageFile)) {
continue;
}
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 9ec5040c..22d8d35a 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
@@ -52,7 +52,7 @@ 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)) {
+ if (!isInvalidPngTestFile(imageFile)) {
result.add(imageFile);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
index 93e35511..520cc997 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
@@ -33,7 +33,7 @@ public class XmpDumpTest extends ImagingTest {
final List<File> images = getTestImages();
for (final File imageFile : images) {
- if (imageFile.getName().toLowerCase().endsWith(".png") && isInvalidPNGTestFile(imageFile)) {
+ if (imageFile.getName().toLowerCase().endsWith(".png") && isInvalidPngTestFile(imageFile)) {
continue;
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
index 64900abc..51a2b92b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
@@ -43,7 +43,7 @@ public class XmpUpdateTest<E extends XmpImagingParameters<E>> extends ImagingTes
for (final File imageFile : images) {
if (imageFile.getName().toLowerCase().endsWith(".png")
- && isInvalidPNGTestFile(imageFile)) {
+ && isInvalidPngTestFile(imageFile)) {
continue;
}