kinow commented on a change in pull request #193: URL: https://github.com/apache/commons-imaging/pull/193#discussion_r780634569
########## File path: src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java ########## @@ -0,0 +1,259 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.imaging.formats.tiff; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.ByteOrder; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.imaging.FormatCompliance; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.common.bytesource.ByteSourceFile; +import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; +import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; +import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; +import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory; +import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** + * Performs a test in which a TIFF file with the special-purpose 32-bit integer + * sample type is used to store data to a file. The file is then read to see if + * it matches the original values. The primary purpose of this test is to verify + * that the TIFF data reader classes behave correctly when reading raster data + * in various formats. + */ +public class TiffRoundTripInt32Test extends TiffBaseTest { + + @TempDir + Path tempDir; + + int width = 48; + int height = 23; + + int[] sample = new int[width * height]; + + public TiffRoundTripInt32Test() { + // populate the image data + for (int iCol = 0; iCol < width; iCol++) { + for (int iRow = 0; iRow < height; iRow++) { + final int index = iRow * width + iCol; + sample[index] = index-10; // -10 so at least some are negative + } + } + } + + + + @Test + public void test() throws Exception { + final File[] testFile = new File[4]; + testFile[0] = writeFile(32, ByteOrder.LITTLE_ENDIAN, false); + testFile[1] = writeFile(32, ByteOrder.BIG_ENDIAN, false); + testFile[2] = writeFile(32, ByteOrder.LITTLE_ENDIAN, true); + testFile[3] = writeFile(32, ByteOrder.BIG_ENDIAN, true); + for (int i = 0; i < testFile.length; i++) { + final String name = testFile[i].getName(); + final ByteSourceFile byteSource = new ByteSourceFile(testFile[i]); + final TiffReader tiffReader = new TiffReader(true); + final TiffContents contents = tiffReader.readDirectories( + byteSource, + true, // indicates that application should read image data, if present + FormatCompliance.getDefault()); + final TiffDirectory directory = contents.directories.get(0); + TiffRasterData rdInt = directory.getRasterData(null); + int []test = rdInt.getIntData(); + for(int j=0; j<sample.length; j++){ + assertEquals(sample[j], test[j], + "Extracted data does not match original, test "+name+": " + + i + ", index " + j); + } + final Map<String, Object> params = new HashMap<>(); + params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2); + params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2); + params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width-4); + params.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height-4); + TiffRasterData rdSub = directory.getRasterData(params); + assertEquals(width-4, rdSub.getWidth(), "Invalid sub-image width"); + assertEquals(height-4, rdSub.getHeight(), "Invalid sub-image height"); + for(int x = 2; x<width-2; x++){ + for(int y=2; y<height-2; y++){ + final int a = rdInt.getIntValue(x, y); + final int b = rdSub.getIntValue(x-2, y-2); + assertEquals(a, b, "Sub Image test failed at (" + x + "," + y + ")"); + } + } + final Map<String, Object> xparams = new HashMap<>(); + xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2); + xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2); + xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width); + xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height); + assertThrows(ImageReadException.class, ()->directory.getRasterData(xparams), + "Failed to catch bad subimage for test "+name); + } + } + + private File writeFile(final int bitsPerSample, final ByteOrder byteOrder, final boolean useTiles) + throws IOException, ImageWriteException { + final String name = String.format("Int32RoundTrip_%2d_%s_%s.tiff", + bitsPerSample, + byteOrder == ByteOrder.LITTLE_ENDIAN ? "LE" : "BE", + useTiles ? "Tiles" : "Strips"); + final File outputFile = new File(tempDir.toFile(), name); + + final int bytesPerSample = bitsPerSample / 8; + int nRowsInBlock; + int nColsInBlock; + int nBytesInBlock; + if (useTiles) { + // Define the tiles so that they will not evenly subdivide + // the image. This will allow the test to evaluate how the + // data reader processes tiles that are only partially used. + nRowsInBlock = 12; + nColsInBlock = 20; + } else { + // Define the strips so that they will not evenly subdivide + // the image. This will allow the test to evaluate how the + // data reader processes strips that are only partially used. + nRowsInBlock = 2; + nColsInBlock = width; + } + nBytesInBlock = nRowsInBlock * nColsInBlock * bytesPerSample; + + byte[][] blocks; + blocks = this.getBytesForOutput32(sample, width, height, nRowsInBlock, nColsInBlock, byteOrder); + + + // NOTE: At this time, Tile format is not supported. + // When it is, modify the tags below to populate + // TIFF_TAG_TILE_* appropriately. Review comment: :+1: thanks! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
