Merge pull request #6 from umjammer/0.2.6

0.2.6

Author: umjammer

README.md

@@ -6,13 +6,13 @@
 
 # vavi-image-webp
 
-<img src="https://upload.wikimedia.org/wikipedia/commons/0/00/WebP_logo_2010.png" width="160" /><sub>© <a href="https://developers.google.com/speed/webp">Google</a></sub>
+<img alt="webp logo" src="https://upload.wikimedia.org/wikipedia/commons/0/00/WebP_logo_2010.png" width="100" /> <sub>© <a href="https://developers.google.com/speed/webp">Google</a></sub>
 
 An implementation of the VP8 image/video codec in _**pure Java**_.
 
 ## Install
 
-https://jitpack.io/#umjammer/vavi-image-webp
+ * [maven](https://jitpack.io/#umjammer/vavi-image-webp)
 
 ## Usage
 
@@ -23,3 +23,5 @@ https://jitpack.io/#umjammer/vavi-image-webp
 ## Reference
 
  * [Original](https://sourceforge.net/projects/javavp8decoder/)
+
+## TODO

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-image-webp</artifactId>
-  <version>0.2.5</version>
+  <version>0.2.6</version>
 
   <name>Java VP8 Decoder</name>
   <scm>
@@ -35,15 +35,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.12.1</version>
         <configuration>
           <release>17</release>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.5</version>
         <configuration>
           <argLine>
             -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
@@ -95,7 +95,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.2</version>
+        <version>5.12.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>com.github.umjammer</groupId>
       <artifactId>vavi-commons</artifactId>
-      <version>1.1.10</version>
+      <version>1.1.14</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/net/sf/javavp8decoder/imageio/WebPImageReader.java

@@ -21,10 +21,10 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.io.IOException;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.imageio.IIOException;
 import javax.imageio.ImageReadParam;
@@ -37,10 +37,12 @@
 
 import net.sf.javavp8decoder.vp8Decoder.VP8Frame;
 
+import static java.lang.System.getLogger;
+
 
 public class WebPImageReader extends ImageReader implements IIOReadProgressListener {
 
-    private static final Logger logger = Logger.getLogger(WebPImageReader.class.getName());
+    private static final Logger logger = getLogger(WebPImageReader.class.getName());
 
     // Constants enumerating the values of colorType
     static final int COLOR_TYPE_GRAY = 0;
@@ -224,14 +226,10 @@ public void readHeader() throws IIOException {
                 }
                 decoder.decodeFrame(false);
             } catch (IOException e) {
-                if (logger.isLoggable(Level.FINE)) {
-                    e.printStackTrace();
-                }
+                logger.log(Level.DEBUG, e.getMessage(), e);
             }
         } catch (IOException e) {
-            if (logger.isLoggable(Level.FINE)) {
-                e.printStackTrace();
-            }
+            logger.log(Level.DEBUG, e.getMessage(), e);
         }
         this.width = decoder.getWidth();
         this.height = decoder.getHeight();

src/main/java/net/sf/javavp8decoder/vp8Decoder/BoolDecoder.java

@@ -23,6 +23,7 @@
 
 
 public class BoolDecoder {
+
     /** # of bits shifted out of value, at most 7 */
     int bit_count;
 
@@ -116,27 +117,27 @@ public int readLiteral(int num_bits) throws IOException {
      * @param p corresponding interior node probabilities
      */
     int readTree(int[] t, int[] p) throws IOException {
-        int i = 0; /* begin at root */
+        int i = 0; // begin at root
 
-        /* Descend tree until leaf is reached */
+        // Descend tree until leaf is reached
         while ((i = t[i + readBool(p[i >> 1])]) > 0) {
         }
-        return -i; /* return value is negation of nonpositive index */
 
+        return -i; // return value is negation of nonpositive index
     }
 
     /**
      * @param t tree specification
      * @param p corresponding interior node probabilities
      */
     int readTreeSkip(int[] t, int[] p, int skip_branches) throws IOException {
-        int i = skip_branches * 2; /* begin at root */
+        int i = skip_branches * 2; // begin at root
 
-        /* Descend tree until leaf is reached */
+        // Descend tree until leaf is reached
         while ((i = t[i + readBool(p[i >> 1])]) > 0) {
         }
-        return -i; /* return value is negation of nonpositive index */
 
+        return -i; // return value is negation of nonpositive index
     }
 
     public void seek() throws IOException {

src/main/java/net/sf/javavp8decoder/vp8Decoder/DeltaQ.java

@@ -18,6 +18,7 @@
 package net.sf.javavp8decoder.vp8Decoder;
 
 public class DeltaQ {
+
     public boolean update = false;
 
     public int v = 0;