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 d01605ab6dc03c94ea6dceb759072eb0e6571230 Author: Gary Gregory <[email protected]> AuthorDate: Tue Jul 4 09:50:47 2023 -0400 Use Java naming conventions --- .../apache/commons/imaging/formats/png/PngCrc.java | 31 +++++++++++----------- .../commons/imaging/formats/png/PngWriter.java | 6 ++--- .../commons/imaging/formats/png/PngCrcTest.java | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java b/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java index 83be14a6..d4dff5bc 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java @@ -18,14 +18,15 @@ package org.apache.commons.imaging.formats.png; // should just use ints, not longs class PngCrc { + /* Table of CRCs of all 8-bit messages. */ - private final long[] crc_table = new long[256]; + private final long[] crcTable = new long[256]; /* Flag: has the table been computed? Initially false. */ - private boolean crc_table_computed; + private boolean crcTableComputed; - public final long continue_partial_crc(final long old_crc, final byte[] buf, final int len) { - return update_crc(old_crc, buf); + public final long continuePartialCrc(final long old_crc, final byte[] buf, final int len) { + return updateCrc(old_crc, buf); } /* @@ -36,15 +37,15 @@ class PngCrc { /* Return the CRC of the bytes buf[0..len-1]. */ public final int crc(final byte[] buf, final int len) { - return (int) (update_crc(0xffffffffL, buf) ^ 0xffffffffL); + return (int) (updateCrc(0xffffffffL, buf) ^ 0xffffffffL); } - public final long finish_partial_crc(final long old_crc) { + public final long finishPartialCrc(final long old_crc) { return (old_crc ^ 0xffffffffL); } /* Make the table for a fast CRC. */ - private void make_crc_table() { + private void makeCrcTable() { long c; int n; int k; @@ -58,27 +59,27 @@ class PngCrc { c = c >> 1; } } - crc_table[n] = c; + crcTable[n] = c; } - crc_table_computed = true; + crcTableComputed = true; } - public final long start_partial_crc(final byte[] buf, final int len) { - return update_crc(0xffffffffL, buf); + public final long startPartialCrc(final byte[] buf, final int len) { + return updateCrc(0xffffffffL, buf); } - private long update_crc(final long crc, final byte[] buf) { + private long updateCrc(final long crc, final byte[] buf) { long c = crc; int n; - if (!crc_table_computed) { - make_crc_table(); + if (!crcTableComputed) { + makeCrcTable(); } for (n = 0; n < buf.length; n++) { // Debug.debug("crc[" + n + "]", c + " (" + Long.toHexString(c) + // ")"); - c = crc_table[(int) ((c ^ buf[n]) & 0xff)] ^ (c >> 8); + c = crcTable[(int) ((c ^ buf[n]) & 0xff)] ^ (c >> 8); } return c; } 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 d83610df..c5d8ccd0 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 @@ -104,10 +104,10 @@ public class PngWriter { final PngCrc png_crc = new PngCrc(); - final long crc1 = png_crc.start_partial_crc(chunkType.array, chunkType.array.length); - final long crc2 = data == null ? crc1 : png_crc.continue_partial_crc( + final long crc1 = png_crc.startPartialCrc(chunkType.array, chunkType.array.length); + final long crc2 = data == null ? crc1 : png_crc.continuePartialCrc( crc1, data, data.length); - final int crc = (int) png_crc.finish_partial_crc(crc2); + final int crc = (int) png_crc.finishPartialCrc(crc2); writeInt(os, crc); } diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java index 5c83809d..628430a1 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java @@ -37,7 +37,7 @@ public class PngCrcTest{ final byte[] byteArray = new byte[4]; assertEquals(558161692, pngCrc.crc(byteArray, (byte)32)); - assertEquals(3736805603L, pngCrc.start_partial_crc(byteArray, 0)); + assertEquals(3736805603L, pngCrc.startPartialCrc(byteArray, 0)); }
