package com.drew.imaging.png;

import com.drew.lang.SequentialByteArrayReader;
import com.drew.lang.SequentialReader;
import com.drew.lang.annotations.NotNull;

import java.io.IOException;

/**
 * @author Drew Noakes http://drewnoakes.com
 */
public class PngHeader
{
    private int _imageWidth;
    private int _imageHeight;
    private byte _bitsPerSample;
    private PngColorType _colorType;
    private byte _compressionType;
    private byte _filterMethod;
    private byte _interlaceMethod;

    public PngHeader(@NotNull byte[] bytes) throws PngProcessingException
    {
        if (bytes.length != 13) {
            throw new PngProcessingException("PNG header chunk must have 13 data bytes");
        }
        SequentialReader reader = new SequentialByteArrayReader(bytes);
        try {
            _imageWidth = reader.getInt32();
            _imageHeight = reader.getInt32();
            _bitsPerSample = reader.getInt8();
            _colorType = PngColorType.fromNumericValue(reader.getInt8());
            _compressionType = reader.getInt8();
            _filterMethod = reader.getInt8();
            _interlaceMethod = reader.getInt8();
        } catch (IOException e) {
            // Should never happen
            throw new PngProcessingException(e);
        }
    }

    public int getImageWidth()
    {
        return _imageWidth;
    }

    public int getImageHeight()
    {
        return _imageHeight;
    }

    public byte getBitsPerSample()
    {
        return _bitsPerSample;
    }

    public PngColorType getColorType()
    {
        return _colorType;
    }

    public byte getCompressionType()
    {
        return _compressionType;
    }

    public byte getFilterMethod()
    {
        return _filterMethod;
    }

    public byte getInterlaceMethod()
    {
        return _interlaceMethod;
    }
}

@@ -349,24 +349,37 @@
 sPerSample;%0A
+    @NotNull%0A
     private 
@@ -399,24 +399,24 @@
 _colorType;%0A
-
     private 
@@ -960,68 +960,318 @@
     
-_colorType = PngColorType.fromNumericValue(reader.getInt8())
+byte colorTypeNumber = reader.getInt8();%0A            PngColorType colorType = PngColorType.fromNumericValue(colorTypeNumber);%0A            if (colorType == null) %7B%0A                throw new PngProcessingException(%22Unexpected PNG color type: %22 + colorTypeNumber);%0A            %7D%0A            _colorType = colorType
 ;%0A  
@@ -1764,32 +1764,45 @@
 rSample;%0A    %7D%0A%0A
+    @NotNull%0A
     public PngCo

Replace NRE with more meaningful PngProcessingException.