Moved to java 1.8. Code cleanup and formatting.

[imagesqueeze.git] / src / main / java / eu / svjatoslav / imagesqueeze / codec / ImageMetaData.java

diff --git a/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java b/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java
index 4b21a22..c97bb32 100755 (executable)
--- a/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java
+++ b/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java
@@ -1,7 +1,7 @@
 /*
  * Imagesqueeze - Image codec optimized for photos.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -11,34 +11,30 @@ package eu.svjatoslav.imagesqueeze.codec;
 
 /**
  * Class to hold image metadata.
- * Like image dimensions, header version, compression quality, etc.. 
+ * Like image dimensions, header version, compression quality, etc..
  */
 
-import java.io.IOException;
-
 import eu.svjatoslav.commons.data.BitInputStream;
 import eu.svjatoslav.commons.data.BitOutputStream;
 
-public class ImageMetaData {
-
-       int version;
-       int width;
-       int height;
-
-       public void load(final BitInputStream inputStream) throws IOException {
-
-               version = inputStream.readBits(16);
-               width = inputStream.readIntegerCompressed8();
-               height = inputStream.readIntegerCompressed8();
-
-       }
-
-       public void save(final BitOutputStream outputStream) throws IOException {
+import java.io.IOException;
 
-               outputStream.storeBits(version, 16);
-               outputStream.storeIntegerCompressed8(width);
-               outputStream.storeIntegerCompressed8(height);
+public class ImageMetaData {
 
-       }
+    int version;
+    int width;
+    int height;
+
+    public void load(final BitInputStream inputStream) throws IOException {
+        version = inputStream.readBits(16);
+        width = ImageDecoder.readIntegerCompressed8(inputStream);
+        height = ImageDecoder.readIntegerCompressed8(inputStream);
+    }
+
+    public void save(final BitOutputStream outputStream) throws IOException {
+        outputStream.storeBits(version, 16);
+        ImageEncoder.storeIntegerCompressed8(outputStream, width);
+        ImageEncoder.storeIntegerCompressed8(outputStream, height);
+    }
 
 }