X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=imagesqueeze.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fimagesqueeze%2Fcodec%2FImageMetaData.java;h=49e9000032b56630140001124591c075b083e010;hp=4b21a22c8233ba4f42dc3e11df2472dafe536496;hb=a4acb4f31760b0c654f9a041eef9797782d6043a;hpb=84d3759e6f959c1f9f8b29bec5303d57f1c5c098 diff --git a/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java b/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java index 4b21a22..49e9000 100755 --- 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,7 +11,7 @@ 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; @@ -26,19 +26,15 @@ public class ImageMetaData { int height; public void load(final BitInputStream inputStream) throws IOException { - version = inputStream.readBits(16); - width = inputStream.readIntegerCompressed8(); - height = inputStream.readIntegerCompressed8(); - + width = ImageDecoder.readIntegerCompressed8(inputStream); + height = ImageDecoder.readIntegerCompressed8(inputStream); } public void save(final BitOutputStream outputStream) throws IOException { - outputStream.storeBits(version, 16); - outputStream.storeIntegerCompressed8(width); - outputStream.storeIntegerCompressed8(height); - + ImageEncoder.storeIntegerCompressed8(outputStream, width); + ImageEncoder.storeIntegerCompressed8(outputStream, height); } }