--- old/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java 2020-07-30 10:23:12.962895100 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java 2020-07-30 10:23:10.688778200 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -177,7 +177,7 @@ super(originator); } - /** Overrides the method defined in the superclass. */ + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) { @@ -188,7 +188,7 @@ resetHeaderInfo(); } - /** Overrides the method defined in the superclass. */ + @Override public int getNumImages(boolean allowSearch) throws IOException { if (iis == null) { throw new IllegalStateException(I18N.getString("GetNumImages0")); @@ -210,6 +210,7 @@ return width; } + @Override public int getHeight(int imageIndex) throws IOException { checkIndex(imageIndex); try { @@ -762,6 +763,7 @@ gotHeader = true; } + @Override public Iterator getImageTypes(int imageIndex) throws IOException { checkIndex(imageIndex); @@ -776,10 +778,12 @@ return list.iterator(); } + @Override public ImageReadParam getDefaultReadParam() { return new ImageReadParam(); } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IOException { checkIndex(imageIndex); @@ -793,10 +797,12 @@ return metadata; } + @Override public IIOMetadata getStreamMetadata() throws IOException { return null; } + @Override public boolean isRandomAccessEasy(int imageIndex) throws IOException { checkIndex(imageIndex); try { @@ -807,6 +813,7 @@ return metadata.compression == BI_RGB; } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException { @@ -1047,10 +1054,12 @@ return bi; } + @Override public boolean canReadRaster() { return true; } + @Override public Raster readRaster(int imageIndex, ImageReadParam param) throws IOException { BufferedImage bi = read(imageIndex, param); @@ -1064,6 +1073,7 @@ colorModel = originalColorModel = null; } + @Override public void reset() { super.reset(); iis = null; @@ -1924,7 +1934,8 @@ } reader.addIIOReadProgressListener(new EmbeddedProgressAdapter() { - public void imageProgress(ImageReader source, + @Override + public void imageProgress(ImageReader source, float percentageDone) { processImageProgress(percentageDone); @@ -1932,6 +1943,7 @@ }); reader.addIIOReadUpdateListener(new IIOReadUpdateListener() { + @Override public void imageUpdate(ImageReader source, BufferedImage theImage, int minX, int minY, @@ -1943,11 +1955,13 @@ width, height, periodX, periodY, bands); } + @Override public void passComplete(ImageReader source, BufferedImage theImage) { processPassComplete(theImage); } + @Override public void passStarted(ImageReader source, BufferedImage theImage, int pass, @@ -1960,15 +1974,18 @@ minX, minY, periodX, periodY, bands); } + @Override public void thumbnailPassComplete(ImageReader source, BufferedImage thumb) {} - public void thumbnailPassStarted(ImageReader source, + @Override + public void thumbnailPassStarted(ImageReader source, BufferedImage thumb, int pass, int minPass, int maxPass, int minX, int minY, int periodX, int periodY, int[] bands) {} + @Override public void thumbnailUpdate(ImageReader source, BufferedImage theThumbnail, int minX, int minY, @@ -1978,6 +1995,7 @@ }); reader.addIIOReadWarningListener(new IIOReadWarningListener() { + @Override public void warningOccurred(ImageReader source, String warning) { processWarningOccurred(warning); @@ -1999,14 +2017,23 @@ } private class EmbeddedProgressAdapter implements IIOReadProgressListener { + @Override public void imageComplete(ImageReader src) {} + @Override public void imageProgress(ImageReader src, float percentageDone) {} + @Override public void imageStarted(ImageReader src, int imageIndex) {} + @Override public void thumbnailComplete(ImageReader src) {} + @Override public void thumbnailProgress(ImageReader src, float percentageDone) {} + @Override public void thumbnailStarted(ImageReader src, int iIdx, int tIdx) {} + @Override public void sequenceComplete(ImageReader src) {} + @Override public void sequenceStarted(ImageReader src, int minIndex) {} + @Override public void readAborted(ImageReader src) {} }