--- 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) {} } --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java 2020-07-30 10:23:32.465340400 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java 2020-07-30 10:23:30.213789200 +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 @@ -95,6 +95,7 @@ super(originator); } + @Override public void setOutput(Object output) { super.setOutput(output); // validates output if (output != null) { @@ -106,14 +107,17 @@ this.stream = null; } + @Override public ImageWriteParam getDefaultWriteParam() { return new BMPImageWriteParam(); } + @Override public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param) { return null; } + @Override public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) { BMPMetadata meta = new BMPMetadata(); @@ -127,21 +131,25 @@ return meta; } + @Override public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param) { return null; } + @Override public IIOMetadata convertImageMetadata(IIOMetadata metadata, ImageTypeSpecifier type, ImageWriteParam param) { return null; } + @Override public boolean canWriteRasters() { return true; } + @Override public void write(IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param) throws IOException { @@ -1316,6 +1324,7 @@ stream.writeInt(dword); } + @Override public void reset() { super.reset(); stream = null; @@ -1374,24 +1383,31 @@ private class IIOWriteProgressAdapter implements IIOWriteProgressListener { + @Override public void imageComplete(ImageWriter source) { } + @Override public void imageProgress(ImageWriter source, float percentageDone) { } + @Override public void imageStarted(ImageWriter source, int imageIndex) { } + @Override public void thumbnailComplete(ImageWriter source) { } + @Override public void thumbnailProgress(ImageWriter source, float percentageDone) { } + @Override public void thumbnailStarted(ImageWriter source, int imageIndex, int thumbnailIndex) { } + @Override public void writeAborted(ImageWriter source) { } } --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java 2020-07-30 10:23:45.473757200 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java 2020-07-30 10:23:43.180406900 +0530 @@ -128,6 +128,7 @@ } // Take input from an ImageInputStream + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) { @@ -146,6 +147,7 @@ resetStreamSettings(); } + @Override public int getNumImages(boolean allowSearch) throws IIOException { if (stream == null) { throw new IllegalStateException("Input not set!"); @@ -175,6 +177,7 @@ } } + @Override public int getWidth(int imageIndex) throws IIOException { checkIndex(imageIndex); @@ -186,6 +189,7 @@ return imageMetadata.imageWidth; } + @Override public int getHeight(int imageIndex) throws IIOException { checkIndex(imageIndex); @@ -227,6 +231,7 @@ return new ImageTypeSpecifier(colorModel, sampleModel); } + @Override public Iterator getImageTypes(int imageIndex) throws IIOException { checkIndex(imageIndex); @@ -289,15 +294,18 @@ return l.iterator(); } + @Override public ImageReadParam getDefaultReadParam() { return new ImageReadParam(); } + @Override public IIOMetadata getStreamMetadata() throws IIOException { readHeader(); return streamMetadata; } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IIOException { checkIndex(imageIndex); @@ -855,6 +863,7 @@ bands); } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IIOException { if (stream == null) { @@ -1037,6 +1046,7 @@ * Remove all settings including global settings such as * {@code Locale}s and listeners, as well as stream settings. */ + @Override public void reset() { super.reset(); resetStreamSettings(); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java 2020-07-30 10:23:58.359933800 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java 2020-07-30 10:23:56.040839400 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -267,6 +267,7 @@ } } + @Override public boolean canWriteSequence() { return true; } @@ -317,6 +318,7 @@ * Creates a default stream metadata object and merges in the * supplied metadata. */ + @Override public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param) { if (inData == null) { @@ -334,6 +336,7 @@ * Creates a default image metadata object and merges in the * supplied metadata. */ + @Override public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, ImageWriteParam param) { @@ -364,6 +367,7 @@ return im; } + @Override public void endWriteSequence() throws IOException { if (stream == null) { throw new IllegalStateException("output == null!"); @@ -375,6 +379,7 @@ resetLocal(); } + @Override public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) { GIFWritableImageMetadata imageMetadata = @@ -422,6 +427,7 @@ return imageMetadata; } + @Override public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param) { GIFWritableStreamMetadata streamMetadata = new GIFWritableStreamMetadata(); @@ -429,10 +435,12 @@ return streamMetadata; } + @Override public ImageWriteParam getDefaultWriteParam() { return new GIFImageWriteParam(getLocale()); } + @Override public void prepareWriteSequence(IIOMetadata streamMetadata) throws IOException { @@ -455,6 +463,7 @@ this.isWritingSequence = true; } + @Override public void reset() { super.reset(); resetLocal(); @@ -470,6 +479,7 @@ this.imageIndex = 0; } + @Override public void setOutput(Object output) { super.setOutput(output); if (output != null) { @@ -484,6 +494,7 @@ } } + @Override public void write(IIOMetadata sm, IIOImage iioimage, ImageWriteParam p) throws IOException { @@ -511,6 +522,7 @@ write(true, true, streamMetadata, iioimage, p); } + @Override public void writeToSequence(IIOImage image, ImageWriteParam param) throws IOException { if (stream == null) { @@ -1319,6 +1331,7 @@ this.compressionType = compressionTypes[0]; } + @Override public void setCompressionMode(int mode) { if (mode == MODE_DISABLED) { throw new UnsupportedOperationException("MODE_DISABLED is not supported."); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2020-07-30 10:24:11.483244100 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2020-07-30 10:24:09.117768900 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -278,6 +278,7 @@ } } + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) @@ -384,6 +385,7 @@ tablesOnlyChecked = true; } + @Override public int getNumImages(boolean allowSearch) throws IOException { setThreadLock(); try { // locked thread @@ -830,6 +832,7 @@ } } + @Override public int getWidth(int imageIndex) throws IOException { setThreadLock(); try { @@ -843,6 +846,7 @@ } } + @Override public int getHeight(int imageIndex) throws IOException { setThreadLock(); try { @@ -871,6 +875,7 @@ return ret; } + @Override public ImageTypeSpecifier getRawImageType(int imageIndex) throws IOException { setThreadLock(); @@ -888,6 +893,7 @@ } } + @Override public Iterator getImageTypes(int imageIndex) throws IOException { setThreadLock(); @@ -1058,10 +1064,12 @@ /////// End of Color Conversion & Image Types + @Override public ImageReadParam getDefaultReadParam() { return new JPEGImageReadParam(); } + @Override public IIOMetadata getStreamMetadata() throws IOException { setThreadLock(); try { @@ -1075,6 +1083,7 @@ } } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IOException { setThreadLock(); @@ -1101,6 +1110,7 @@ } } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException { setThreadLock(); @@ -1493,6 +1503,7 @@ */ private native void clearNativeReadAbortFlag(long structPointer); + @Override public void abort() { setThreadLock(); try { @@ -1514,10 +1525,12 @@ /** Resets library state when an exception occurred during a read. */ private native void resetLibraryState(long structPointer); + @Override public boolean canReadRaster() { return true; } + @Override public Raster readRaster(int imageIndex, ImageReadParam param) throws IOException { setThreadLock(); @@ -1556,10 +1569,12 @@ return retval; } + @Override public boolean readerSupportsThumbnails() { return true; } + @Override public int getNumThumbnails(int imageIndex) throws IOException { setThreadLock(); try { @@ -1581,6 +1596,7 @@ } } + @Override public int getThumbnailWidth(int imageIndex, int thumbnailIndex) throws IOException { setThreadLock(); @@ -1601,6 +1617,7 @@ } } + @Override public int getThumbnailHeight(int imageIndex, int thumbnailIndex) throws IOException { setThreadLock(); @@ -1621,6 +1638,7 @@ } } + @Override public BufferedImage readThumbnail(int imageIndex, int thumbnailIndex) throws IOException { @@ -1665,6 +1683,7 @@ initProgressData(); } + @Override public void reset() { setThreadLock(); try { @@ -1677,6 +1696,7 @@ private native void resetReader(long structPointer); + @Override public void dispose() { setThreadLock(); try { @@ -1700,6 +1720,7 @@ this.pData = pData; } + @Override public synchronized void dispose() { if (pData != 0) { disposeReader(pData); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2020-07-30 10:24:24.308428600 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2020-07-30 10:24:22.054959400 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -194,6 +194,7 @@ Disposer.addRecord(disposerReferent, disposerRecord); } + @Override public void setOutput(Object output) { setThreadLock(); try { @@ -209,10 +210,12 @@ } } + @Override public ImageWriteParam getDefaultWriteParam() { return new JPEGImageWriteParam(null); } + @Override public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param) { setThreadLock(); try { @@ -222,6 +225,7 @@ } } + @Override public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) { @@ -233,6 +237,7 @@ } } + @Override public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param) { // There isn't much we can do. If it's one of ours, then @@ -248,6 +253,7 @@ return null; } + @Override public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, @@ -299,6 +305,7 @@ return null; } + @Override public int getNumThumbnailsSupported(ImageTypeSpecifier imageType, ImageWriteParam param, IIOMetadata streamMetadata, @@ -319,7 +326,7 @@ static final Dimension [] preferredThumbSizes = {new Dimension(1, 1), new Dimension(255, 255)}; - + @Override public Dimension[] getPreferredThumbnailSizes(ImageTypeSpecifier imageType, ImageWriteParam param, IIOMetadata streamMetadata, @@ -357,10 +364,12 @@ return true; } + @Override public boolean canWriteRasters() { return true; } + @Override public void write(IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param) throws IOException { @@ -1049,6 +1058,7 @@ return true; } + @Override public void prepareWriteSequence(IIOMetadata streamMetadata) throws IOException { setThreadLock(); @@ -1130,6 +1140,7 @@ sequencePrepared = true; } + @Override public void writeToSequence(IIOImage image, ImageWriteParam param) throws IOException { setThreadLock(); @@ -1146,6 +1157,7 @@ } } + @Override public void endWriteSequence() throws IOException { setThreadLock(); try { @@ -1160,6 +1172,7 @@ } } + @Override public synchronized void abort() { setThreadLock(); try { @@ -1204,6 +1217,7 @@ metadata = null; } + @Override public void reset() { setThreadLock(); try { @@ -1215,6 +1229,7 @@ } } + @Override public void dispose() { setThreadLock(); try { @@ -1735,6 +1750,7 @@ this.pData = pData; } + @Override public synchronized void dispose() { if (pData != 0) { disposeWriter(pData); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java 2020-07-30 10:24:36.468861000 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java 2020-07-30 10:24:35.119467000 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -198,6 +198,7 @@ super(originatingProvider); } + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) { @@ -1520,6 +1521,7 @@ } } + @Override public int getNumImages(boolean allowSearch) throws IIOException { if (stream == null) { throw new IllegalStateException("No input source set!"); @@ -1531,6 +1533,7 @@ return 1; } + @Override public int getWidth(int imageIndex) throws IIOException { if (imageIndex != 0) { throw new IndexOutOfBoundsException("imageIndex != 0!"); @@ -1541,6 +1544,7 @@ return metadata.IHDR_width; } + @Override public int getHeight(int imageIndex) throws IIOException { if (imageIndex != 0) { throw new IndexOutOfBoundsException("imageIndex != 0!"); @@ -1551,6 +1555,7 @@ return metadata.IHDR_height; } + @Override public Iterator getImageTypes(int imageIndex) throws IIOException { @@ -1785,6 +1790,7 @@ * After this changes we should override getRawImageType() * to return last element of image types list. */ + @Override public ImageTypeSpecifier getRawImageType(int imageIndex) throws IOException { @@ -1796,15 +1802,18 @@ return raw; } + @Override public ImageReadParam getDefaultReadParam() { return new ImageReadParam(); } + @Override public IIOMetadata getStreamMetadata() throws IIOException { return null; } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IIOException { if (imageIndex != 0) { throw new IndexOutOfBoundsException("imageIndex != 0!"); @@ -1813,6 +1822,7 @@ return metadata; } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IIOException { if (imageIndex != 0) { @@ -1832,6 +1842,7 @@ return theImage; } + @Override public void reset() { super.reset(); resetStreamSettings(); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java 2020-07-30 10:24:48.447449500 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java 2020-07-30 10:24:46.222339000 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -136,6 +136,7 @@ super(originatingProvider); } + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) { @@ -245,6 +246,7 @@ return imageIndex; } + @Override public int getNumImages(boolean allowSearch) throws IOException { if (stream == null) { throw new IllegalStateException("Input not set!"); @@ -262,6 +264,7 @@ return numImages; } + @Override public IIOMetadata getStreamMetadata() throws IIOException { readHeader(); return streamMetadata; @@ -487,11 +490,13 @@ } } + @Override public int getWidth(int imageIndex) throws IOException { seekToImage(imageIndex); return getWidth(); } + @Override public int getHeight(int imageIndex) throws IOException { seekToImage(imageIndex); return getHeight(); @@ -699,6 +704,7 @@ } } + @Override public Iterator getImageTypes(int imageIndex) throws IIOException { List l; // List of ImageTypeSpecifiers @@ -826,6 +832,7 @@ return l.iterator(); } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IIOException { seekToImage(imageIndex); TIFFImageMetadata im @@ -844,6 +851,7 @@ return sm; } + @Override public boolean isRandomAccessEasy(int imageIndex) throws IOException { if (currIndex != -1) { seekToImage(currIndex); @@ -858,18 +866,22 @@ return false; } + @Override public boolean hasThumbnails(int imageIndex) { return false; } + @Override public int getNumThumbnails(int imageIndex) throws IOException { return 0; } + @Override public ImageReadParam getDefaultReadParam() { return new TIFFImageReadParam(); } + @Override public boolean isImageTiled(int imageIndex) throws IOException { seekToImage(imageIndex); @@ -878,16 +890,19 @@ return f != null; } + @Override public int getTileWidth(int imageIndex) throws IOException { seekToImage(imageIndex); return getTileOrStripWidth(); } + @Override public int getTileHeight(int imageIndex) throws IOException { seekToImage(imageIndex); return getTileOrStripHeight(); } + @Override public BufferedImage readTile(int imageIndex, int tileX, int tileY) throws IOException { @@ -918,10 +933,12 @@ return read(imageIndex, param); } + @Override public boolean canReadRaster() { return false; } + @Override public Raster readRaster(int imageIndex, ImageReadParam param) throws IOException { throw new UnsupportedOperationException(); @@ -1009,6 +1026,7 @@ } } + @Override public RenderedImage readAsRenderedImage(int imageIndex, ImageReadParam param) throws IOException { @@ -1135,6 +1153,7 @@ destinationBands); } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException { prepareRead(imageIndex, param); @@ -1353,6 +1372,7 @@ return theImage; } + @Override public void reset() { super.reset(); resetLocal(); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java 2020-07-30 10:25:02.314863800 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java 2020-07-30 10:24:59.998297600 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -258,10 +258,12 @@ super(originatingProvider); } + @Override public ImageWriteParam getDefaultWriteParam() { return new TIFFImageWriteParam(getLocale()); } + @Override public void setOutput(Object output) { if (output != null) { if (!(output instanceof ImageOutputStream)) { @@ -316,11 +318,13 @@ super.setOutput(output); } + @Override public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param) { return new TIFFStreamMetadata(); } + @Override public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) { @@ -342,6 +346,7 @@ return imageMetadata; } + @Override public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param) { // Check arguments. @@ -370,6 +375,7 @@ return outData; } + @Override public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, @@ -2305,6 +2311,7 @@ } } + @Override public void write(IIOMetadata sm, IIOImage iioimage, ImageWriteParam p) throws IOException { @@ -2618,10 +2625,12 @@ currentImage++; } + @Override public boolean canWriteSequence() { return true; } + @Override public void prepareWriteSequence(IIOMetadata streamMetadata) throws IOException { if (getOutput() == null) { @@ -2644,6 +2653,7 @@ this.isWritingSequence = true; } + @Override public void writeToSequence(IIOImage image, ImageWriteParam param) throws IOException { // Check sequence flag. @@ -2656,6 +2666,7 @@ writeInsert(-1, image, param); } + @Override public void endWriteSequence() throws IOException { // Check output. if (getOutput() == null) { @@ -2678,6 +2689,7 @@ } } + @Override public boolean canInsertImage(int imageIndex) throws IOException { if (getOutput() == null) { throw new IllegalStateException("getOutput() == null!"); @@ -2764,6 +2776,7 @@ } } + @Override public void writeInsert(int imageIndex, IIOImage image, ImageWriteParam param) throws IOException { @@ -2844,10 +2857,12 @@ return isInsertingEmpty || isWritingEmpty; } + @Override public boolean canInsertEmpty(int imageIndex) throws IOException { return canInsertImage(imageIndex); } + @Override public boolean canWriteEmpty() throws IOException { if (getOutput() == null) { throw new IllegalStateException("getOutput() == null!"); @@ -2894,6 +2909,7 @@ } } + @Override public void prepareInsertEmpty(int imageIndex, ImageTypeSpecifier imageType, int width, @@ -2915,6 +2931,7 @@ param, false); } + @Override public void prepareWriteEmpty(IIOMetadata streamMetadata, ImageTypeSpecifier imageType, int width, @@ -2944,6 +2961,7 @@ } } + @Override public void endInsertEmpty() throws IOException { if (getOutput() == null) { throw new IllegalStateException("getOutput() == null!"); @@ -2967,6 +2985,7 @@ this.isInsertingEmpty = false; } + @Override public void endWriteEmpty() throws IOException { if (getOutput() == null) { throw new IllegalStateException("getOutput() == null!"); @@ -3021,6 +3040,7 @@ return rootIFD; } + @Override public boolean canReplacePixels(int imageIndex) throws IOException { if (getOutput() == null) { throw new IllegalStateException("getOutput() == null!"); @@ -3046,6 +3066,7 @@ private TIFFImageReader reader = null; + @Override public void prepareReplacePixels(int imageIndex, Rectangle region) throws IOException { synchronized(replacePixelsLock) { @@ -3229,6 +3250,7 @@ sourceBands); } + @Override public void replacePixels(RenderedImage image, ImageWriteParam param) throws IOException { @@ -3568,6 +3590,7 @@ } } + @Override public void replacePixels(Raster raster, ImageWriteParam param) throws IOException { if (raster == null) { @@ -3579,6 +3602,7 @@ param); } + @Override public void endReplacePixels() throws IOException { synchronized(replacePixelsLock) { if(!this.inReplacePixelsNest) { @@ -3612,6 +3636,7 @@ nextSpace = prevNextSpace; } + @Override public void reset() { super.reset(); --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java 2020-07-30 10:25:15.575145300 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java 2020-07-30 10:25:13.259936600 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 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 @@ -76,7 +76,7 @@ super(originator); } - /** Overrides the method defined in the superclass. */ + @Override public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) { @@ -85,7 +85,7 @@ gotHeader = false; } - /** Overrides the method defined in the superclass. */ + @Override public int getNumImages(boolean allowSearch) throws IOException { if (iis == null) { throw new IllegalStateException(I18N.getString("GetNumImages0")); @@ -96,18 +96,21 @@ return 1; } + @Override public int getWidth(int imageIndex) throws IOException { checkIndex(imageIndex); readHeader(); return width; } + @Override public int getHeight(int imageIndex) throws IOException { checkIndex(imageIndex); readHeader(); return height; } + @Override public boolean isRandomAccessEasy(int imageIndex) throws IOException { checkIndex(imageIndex); return true; @@ -152,6 +155,7 @@ gotHeader = true; } + @Override public Iterator getImageTypes(int imageIndex) throws IOException { checkIndex(imageIndex); @@ -164,10 +168,12 @@ return list.iterator(); } + @Override public ImageReadParam getDefaultReadParam() { return new ImageReadParam(); } + @Override public IIOMetadata getImageMetadata(int imageIndex) throws IOException { checkIndex(imageIndex); @@ -177,10 +183,12 @@ return metadata; } + @Override public IIOMetadata getStreamMetadata() throws IOException { return null; } + @Override public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException { @@ -296,16 +304,19 @@ return bi; } + @Override public boolean canReadRaster() { return true; } + @Override public Raster readRaster(int imageIndex, ImageReadParam param) throws IOException { BufferedImage bi = read(imageIndex, param); return bi.getData(); } + @Override public void reset() { super.reset(); iis = null; --- old/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java 2020-07-30 10:25:28.284668900 +0530 +++ new/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java 2020-07-30 10:25:25.913793500 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2017, 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 @@ -97,6 +97,7 @@ super(originator); } + @Override public void setOutput(Object output) { super.setOutput(output); // validates output if (output != null) { @@ -107,10 +108,12 @@ this.stream = null; } + @Override public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param) { return null; } + @Override public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) { WBMPMetadata meta = new WBMPMetadata(); @@ -118,11 +121,13 @@ return meta; } + @Override public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param) { return null; } + @Override public IIOMetadata convertImageMetadata(IIOMetadata metadata, ImageTypeSpecifier type, ImageWriteParam param) { @@ -133,6 +138,7 @@ return true; } + @Override public void write(IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param) throws IOException { @@ -299,6 +305,7 @@ } } + @Override public void reset() { super.reset(); stream = null;