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=68b3bea33b449d541af183236e7b618ebebc851d;hb=a4acb4f31760b0c654f9a041eef9797782d6043a;hpb=c7d0b8e1723045c0df086d9214a35f54db47684c diff --git a/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java b/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java index 68b3bea..49e9000 100755 --- a/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java +++ b/src/main/java/eu/svjatoslav/imagesqueeze/codec/ImageMetaData.java @@ -1,12 +1,23 @@ +/* + * 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. + */ + 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 { @@ -14,21 +25,16 @@ public class ImageMetaData { int width; int height; - - public void load(BitInputStream inputStream) throws IOException{ - - version = inputStream.readBits(16); - width = inputStream.readIntegerCompressed8(); - height = inputStream.readIntegerCompressed8(); - + public void load(final BitInputStream inputStream) throws IOException { + version = inputStream.readBits(16); + width = ImageDecoder.readIntegerCompressed8(inputStream); + height = ImageDecoder.readIntegerCompressed8(inputStream); } - public void save(BitOutputStream outputStream) throws IOException{ - + 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); } }