author | bpb |
Fri, 12 Aug 2016 14:35:56 -0700 | |
changeset 40442 | e97e9982be6d |
parent 36448 | a07e108d5722 |
child 42188 | 471f232f8ea8 |
permissions | -rw-r--r-- |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
1 |
/* |
36448
a07e108d5722
8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes
bpb
parents:
35660
diff
changeset
|
2 |
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
4 |
* |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
10 |
* |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
15 |
* accompanied this code). |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
16 |
* |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
20 |
* |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
23 |
* questions. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
24 |
*/ |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
25 |
package com.sun.imageio.plugins.tiff; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
26 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
27 |
import java.io.EOFException; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
28 |
import java.io.IOException; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
29 |
import java.nio.charset.StandardCharsets; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
30 |
import java.util.ArrayList; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
31 |
import java.util.Arrays; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
32 |
import java.util.Iterator; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
33 |
import java.util.List; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
34 |
import java.util.Set; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
35 |
import javax.imageio.IIOException; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
36 |
import javax.imageio.stream.ImageInputStream; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
37 |
import javax.imageio.stream.ImageOutputStream; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
38 |
import javax.imageio.plugins.tiff.BaselineTIFFTagSet; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
39 |
import javax.imageio.plugins.tiff.TIFFDirectory; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
40 |
import javax.imageio.plugins.tiff.TIFFField; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
41 |
import javax.imageio.plugins.tiff.TIFFTag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
42 |
import javax.imageio.plugins.tiff.TIFFTagSet; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
43 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
44 |
public class TIFFIFD extends TIFFDirectory { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
45 |
private static final long MAX_SAMPLES_PER_PIXEL = 0xffff; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
46 |
private static final long MAX_ASCII_SIZE = 0xffff; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
47 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
48 |
private long stripOrTileByteCountsPosition = -1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
49 |
private long stripOrTileOffsetsPosition = -1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
50 |
private long lastPosition = -1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
51 |
|
40442
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
52 |
|
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
53 |
/** |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
54 |
* Converts a {@code TIFFDirectory} to a {@code TIFFIFD}. |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
55 |
*/ |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
56 |
public static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
57 |
if(dir instanceof TIFFIFD) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
58 |
return (TIFFIFD)dir; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
59 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
60 |
|
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
61 |
TIFFIFD ifd = new TIFFIFD(Arrays.asList(dir.getTagSets()), |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
62 |
dir.getParentTag()); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
63 |
TIFFField[] fields = dir.getTIFFFields(); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
64 |
int numFields = fields.length; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
65 |
for(int i = 0; i < numFields; i++) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
66 |
TIFFField f = fields[i]; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
67 |
TIFFTag tag = f.getTag(); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
68 |
if(tag.isIFDPointer()) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
69 |
TIFFDirectory subDir = null; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
70 |
if (f.hasDirectory()) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
71 |
subDir = f.getDirectory(); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
72 |
} else if (f.getData() instanceof TIFFDirectory) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
73 |
subDir = (TIFFDirectory)f.getData(); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
74 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
75 |
if (subDir != null) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
76 |
TIFFDirectory subIFD = getDirectoryAsIFD(subDir); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
77 |
f = new TIFFField(tag, f.getType(), (long)f.getCount(), |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
78 |
subIFD); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
79 |
} else { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
80 |
f = null; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
81 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
82 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
83 |
if (f != null) { |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
84 |
ifd.addTIFFField(f); |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
85 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
86 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
87 |
|
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
88 |
return ifd; |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
89 |
} |
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
90 |
|
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
91 |
public static TIFFTag getTag(int tagNumber, List<TIFFTagSet> tagSets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
92 |
Iterator<TIFFTagSet> iter = tagSets.iterator(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
93 |
while (iter.hasNext()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
94 |
TIFFTagSet tagSet = iter.next(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
95 |
TIFFTag tag = tagSet.getTag(tagNumber); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
96 |
if (tag != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
97 |
return tag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
98 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
99 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
100 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
101 |
return null; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
102 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
103 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
104 |
public static TIFFTag getTag(String tagName, List<TIFFTagSet> tagSets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
105 |
Iterator<TIFFTagSet> iter = tagSets.iterator(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
106 |
while (iter.hasNext()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
107 |
TIFFTagSet tagSet = iter.next(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
108 |
TIFFTag tag = tagSet.getTag(tagName); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
109 |
if (tag != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
110 |
return tag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
111 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
112 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
113 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
114 |
return null; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
115 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
116 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
117 |
private static void writeTIFFFieldToStream(TIFFField field, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
118 |
ImageOutputStream stream) |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
119 |
throws IOException { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
120 |
int count = field.getCount(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
121 |
Object data = field.getData(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
122 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
123 |
switch (field.getType()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
124 |
case TIFFTag.TIFF_ASCII: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
125 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
126 |
String s = ((String[])data)[i]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
127 |
int length = s.length(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
128 |
for (int j = 0; j < length; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
129 |
stream.writeByte(s.charAt(j) & 0xff); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
130 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
131 |
stream.writeByte(0); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
132 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
133 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
134 |
case TIFFTag.TIFF_UNDEFINED: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
135 |
case TIFFTag.TIFF_BYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
136 |
case TIFFTag.TIFF_SBYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
137 |
stream.write((byte[])data); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
138 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
139 |
case TIFFTag.TIFF_SHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
140 |
stream.writeChars((char[])data, 0, ((char[])data).length); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
141 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
142 |
case TIFFTag.TIFF_SSHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
143 |
stream.writeShorts((short[])data, 0, ((short[])data).length); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
144 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
145 |
case TIFFTag.TIFF_SLONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
146 |
stream.writeInts((int[])data, 0, ((int[])data).length); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
147 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
148 |
case TIFFTag.TIFF_LONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
149 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
150 |
stream.writeInt((int)(((long[])data)[i])); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
151 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
152 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
153 |
case TIFFTag.TIFF_IFD_POINTER: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
154 |
stream.writeInt(0); // will need to be backpatched |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
155 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
156 |
case TIFFTag.TIFF_FLOAT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
157 |
stream.writeFloats((float[])data, 0, ((float[])data).length); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
158 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
159 |
case TIFFTag.TIFF_DOUBLE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
160 |
stream.writeDoubles((double[])data, 0, ((double[])data).length); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
161 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
162 |
case TIFFTag.TIFF_SRATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
163 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
164 |
stream.writeInt(((int[][])data)[i][0]); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
165 |
stream.writeInt(((int[][])data)[i][1]); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
166 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
167 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
168 |
case TIFFTag.TIFF_RATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
169 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
170 |
long num = ((long[][])data)[i][0]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
171 |
long den = ((long[][])data)[i][1]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
172 |
stream.writeInt((int)num); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
173 |
stream.writeInt((int)den); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
174 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
175 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
176 |
default: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
177 |
// error |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
178 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
179 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
180 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
181 |
public TIFFIFD(List<TIFFTagSet> tagSets, TIFFTag parentTag) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
182 |
super(tagSets.toArray(new TIFFTagSet[tagSets.size()]), |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
183 |
parentTag); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
184 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
185 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
186 |
public TIFFIFD(List<TIFFTagSet> tagSets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
187 |
this(tagSets, null); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
188 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
189 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
190 |
public List<TIFFTagSet> getTagSetList() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
191 |
return Arrays.asList(getTagSets()); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
192 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
193 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
194 |
/** |
36448
a07e108d5722
8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes
bpb
parents:
35660
diff
changeset
|
195 |
* Returns an {@code Iterator} over the TIFF fields. The |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
196 |
* traversal is in the order of increasing tag number. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
197 |
*/ |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
198 |
// Note: the sort is guaranteed for low fields by the use of an |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
199 |
// array wherein the index corresponds to the tag number and for |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
200 |
// the high fields by the use of a TreeMap with tag number keys. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
201 |
public Iterator<TIFFField> iterator() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
202 |
return Arrays.asList(getTIFFFields()).iterator(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
203 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
204 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
205 |
/** |
36448
a07e108d5722
8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes
bpb
parents:
35660
diff
changeset
|
206 |
* Read the value of a field. The {@code data} parameter should be |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
207 |
* an array of length 1 of Object. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
208 |
* |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
209 |
* @param stream the input stream |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
210 |
* @param type the type as read from the stream |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
211 |
* @param count the count read from the stream |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
212 |
* @param data a container for the data |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
213 |
* @return the updated count |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
214 |
* @throws IOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
215 |
*/ |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
216 |
private static int readFieldValue(ImageInputStream stream, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
217 |
int type, int count, Object[] data) throws IOException { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
218 |
Object obj; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
219 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
220 |
switch (type) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
221 |
case TIFFTag.TIFF_BYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
222 |
case TIFFTag.TIFF_SBYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
223 |
case TIFFTag.TIFF_UNDEFINED: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
224 |
case TIFFTag.TIFF_ASCII: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
225 |
byte[] bvalues = new byte[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
226 |
stream.readFully(bvalues, 0, count); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
227 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
228 |
if (type == TIFFTag.TIFF_ASCII) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
229 |
// Can be multiple strings |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
230 |
ArrayList<String> v = new ArrayList<>(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
231 |
boolean inString = false; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
232 |
int prevIndex = 0; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
233 |
for (int index = 0; index <= count; index++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
234 |
if (index < count && bvalues[index] != 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
235 |
if (!inString) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
236 |
// start of string |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
237 |
prevIndex = index; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
238 |
inString = true; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
239 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
240 |
} else { // null or special case at end of string |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
241 |
if (inString) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
242 |
// end of string |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
243 |
String s = new String(bvalues, prevIndex, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
244 |
index - prevIndex, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
245 |
StandardCharsets.US_ASCII); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
246 |
v.add(s); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
247 |
inString = false; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
248 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
249 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
250 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
251 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
252 |
count = v.size(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
253 |
String[] strings; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
254 |
if (count != 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
255 |
strings = new String[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
256 |
for (int c = 0; c < count; c++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
257 |
strings[c] = v.get(c); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
258 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
259 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
260 |
// This case has been observed when the value of |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
261 |
// 'count' recorded in the field is non-zero but |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
262 |
// the value portion contains all nulls. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
263 |
count = 1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
264 |
strings = new String[]{""}; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
265 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
266 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
267 |
obj = strings; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
268 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
269 |
obj = bvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
270 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
271 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
272 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
273 |
case TIFFTag.TIFF_SHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
274 |
char[] cvalues = new char[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
275 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
276 |
cvalues[j] = (char) (stream.readUnsignedShort()); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
277 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
278 |
obj = cvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
279 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
280 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
281 |
case TIFFTag.TIFF_LONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
282 |
case TIFFTag.TIFF_IFD_POINTER: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
283 |
long[] lvalues = new long[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
284 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
285 |
lvalues[j] = stream.readUnsignedInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
286 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
287 |
obj = lvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
288 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
289 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
290 |
case TIFFTag.TIFF_RATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
291 |
long[][] llvalues = new long[count][2]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
292 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
293 |
llvalues[j][0] = stream.readUnsignedInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
294 |
llvalues[j][1] = stream.readUnsignedInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
295 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
296 |
obj = llvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
297 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
298 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
299 |
case TIFFTag.TIFF_SSHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
300 |
short[] svalues = new short[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
301 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
302 |
svalues[j] = stream.readShort(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
303 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
304 |
obj = svalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
305 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
306 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
307 |
case TIFFTag.TIFF_SLONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
308 |
int[] ivalues = new int[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
309 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
310 |
ivalues[j] = stream.readInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
311 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
312 |
obj = ivalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
313 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
314 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
315 |
case TIFFTag.TIFF_SRATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
316 |
int[][] iivalues = new int[count][2]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
317 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
318 |
iivalues[j][0] = stream.readInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
319 |
iivalues[j][1] = stream.readInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
320 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
321 |
obj = iivalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
322 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
323 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
324 |
case TIFFTag.TIFF_FLOAT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
325 |
float[] fvalues = new float[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
326 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
327 |
fvalues[j] = stream.readFloat(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
328 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
329 |
obj = fvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
330 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
331 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
332 |
case TIFFTag.TIFF_DOUBLE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
333 |
double[] dvalues = new double[count]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
334 |
for (int j = 0; j < count; j++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
335 |
dvalues[j] = stream.readDouble(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
336 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
337 |
obj = dvalues; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
338 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
339 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
340 |
default: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
341 |
obj = null; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
342 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
343 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
344 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
345 |
data[0] = obj; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
346 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
347 |
return count; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
348 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
349 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
350 |
// |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
351 |
// Class to represent an IFD entry where the actual content is at an offset |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
352 |
// in the stream somewhere outside the IFD itself. This occurs when the |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
353 |
// value cannot be contained within four bytes. Seeking is required to read |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
354 |
// such field values. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
355 |
// |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
356 |
private static class TIFFIFDEntry { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
357 |
public final TIFFTag tag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
358 |
public final int type; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
359 |
public final int count; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
360 |
public final long offset; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
361 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
362 |
TIFFIFDEntry(TIFFTag tag, int type, int count, long offset) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
363 |
this.tag = tag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
364 |
this.type = type; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
365 |
this.count = count; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
366 |
this.offset = offset; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
367 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
368 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
369 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
370 |
// |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
371 |
// Verify that data pointed to outside of the IFD itself are within the |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
372 |
// stream. To be called after all fields have been read and populated. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
373 |
// |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
374 |
private void checkFieldOffsets(long streamLength) throws IIOException { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
375 |
if (streamLength < 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
376 |
return; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
377 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
378 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
379 |
// StripOffsets |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
380 |
List<TIFFField> offsets = new ArrayList<>(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
381 |
TIFFField f = getTIFFField(BaselineTIFFTagSet.TAG_STRIP_OFFSETS); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
382 |
int count = 0; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
383 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
384 |
count = f.getCount(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
385 |
offsets.add(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
386 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
387 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
388 |
// TileOffsets |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
389 |
f = getTIFFField(BaselineTIFFTagSet.TAG_TILE_OFFSETS); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
390 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
391 |
int sz = offsets.size(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
392 |
int newCount = f.getCount(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
393 |
if (sz > 0 && newCount != count) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
394 |
throw new IIOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
395 |
("StripOffsets count != TileOffsets count"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
396 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
397 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
398 |
if (sz == 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
399 |
count = newCount; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
400 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
401 |
offsets.add(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
402 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
403 |
|
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
404 |
List<TIFFField> byteCounts = new ArrayList<>(); |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
405 |
if (offsets.size() > 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
406 |
// StripByteCounts |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
407 |
f = getTIFFField(BaselineTIFFTagSet.TAG_STRIP_BYTE_COUNTS); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
408 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
409 |
if (f.getCount() != count) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
410 |
throw new IIOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
411 |
("StripByteCounts count != number of offsets"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
412 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
413 |
byteCounts.add(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
414 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
415 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
416 |
// TileByteCounts |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
417 |
f = getTIFFField(BaselineTIFFTagSet.TAG_TILE_BYTE_COUNTS); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
418 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
419 |
if (f.getCount() != count) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
420 |
throw new IIOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
421 |
("TileByteCounts count != number of offsets"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
422 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
423 |
byteCounts.add(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
424 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
425 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
426 |
if (byteCounts.size() > 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
427 |
for (TIFFField offset : offsets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
428 |
for (TIFFField byteCount : byteCounts) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
429 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
430 |
long dataOffset = offset.getAsLong(i); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
431 |
long dataByteCount = byteCount.getAsLong(i); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
432 |
if (dataOffset + dataByteCount > streamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
433 |
throw new IIOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
434 |
("Data segment out of stream"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
435 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
436 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
437 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
438 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
439 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
440 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
441 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
442 |
// JPEGInterchangeFormat and JPEGInterchangeFormatLength |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
443 |
TIFFField jpegOffset = |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
444 |
getTIFFField(BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
445 |
if (jpegOffset != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
446 |
TIFFField jpegLength = |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
447 |
getTIFFField(BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
448 |
if (jpegLength != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
449 |
if (jpegOffset.getAsLong(0) + jpegLength.getAsLong(0) |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
450 |
> streamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
451 |
throw new IIOException |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
452 |
("JPEGInterchangeFormat data out of stream"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
453 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
454 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
455 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
456 |
|
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
457 |
// Ensure there is at least a data pointer for JPEG interchange format or |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
458 |
// both data offsets and byte counts for other compression types. |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
459 |
if (jpegOffset == null && (offsets.size() == 0 || byteCounts.size() == 0)) { |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
460 |
throw new IIOException("Insufficient data offsets or byte counts"); |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
461 |
} |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
462 |
|
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
463 |
// JPEGQTables - one 64-byte table for each offset. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
464 |
f = getTIFFField(BaselineTIFFTagSet.TAG_JPEG_Q_TABLES); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
465 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
466 |
long[] tableOffsets = f.getAsLongs(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
467 |
for (long off : tableOffsets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
468 |
if (off + 64 > streamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
469 |
throw new IIOException("JPEGQTables data out of stream"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
470 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
471 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
472 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
473 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
474 |
// JPEGDCTables |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
475 |
f = getTIFFField(BaselineTIFFTagSet.TAG_JPEG_DC_TABLES); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
476 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
477 |
long[] tableOffsets = f.getAsLongs(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
478 |
for (long off : tableOffsets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
479 |
if (off + 16 > streamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
480 |
throw new IIOException("JPEGDCTables data out of stream"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
481 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
482 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
483 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
484 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
485 |
// JPEGACTables |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
486 |
f = getTIFFField(BaselineTIFFTagSet.TAG_JPEG_AC_TABLES); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
487 |
if (f != null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
488 |
long[] tableOffsets = f.getAsLongs(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
489 |
for (long off : tableOffsets) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
490 |
if (off + 16 > streamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
491 |
throw new IIOException("JPEGACTables data out of stream"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
492 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
493 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
494 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
495 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
496 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
497 |
// Stream position initially at beginning, left at end |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
498 |
// if ignoreUnknownFields is true, do not load fields for which |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
499 |
// a tag cannot be found in an allowed TagSet. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
500 |
public void initialize(ImageInputStream stream, boolean isPrimaryIFD, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
501 |
boolean ignoreUnknownFields) throws IOException { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
502 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
503 |
removeTIFFFields(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
504 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
505 |
long streamLength = stream.length(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
506 |
boolean haveStreamLength = streamLength != -1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
507 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
508 |
List<TIFFTagSet> tagSetList = getTagSetList(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
509 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
510 |
List<Object> entries = new ArrayList<>(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
511 |
Object[] entryData = new Object[1]; // allocate once for later reuse. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
512 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
513 |
// Read the IFD entries, loading the field values which are no more than |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
514 |
// four bytes long, and storing the 4-byte offsets for the others. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
515 |
int numEntries = stream.readUnsignedShort(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
516 |
for (int i = 0; i < numEntries; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
517 |
// Read tag number, value type, and value count. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
518 |
int tagNumber = stream.readUnsignedShort(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
519 |
int type = stream.readUnsignedShort(); |
34817
9b585ae27455
8144245: [PIT] javax/imageio/plugins/shared/WriteAfterAbort.java
bpb
parents:
34416
diff
changeset
|
520 |
int sizeOfType; |
9b585ae27455
8144245: [PIT] javax/imageio/plugins/shared/WriteAfterAbort.java
bpb
parents:
34416
diff
changeset
|
521 |
try { |
9b585ae27455
8144245: [PIT] javax/imageio/plugins/shared/WriteAfterAbort.java
bpb
parents:
34416
diff
changeset
|
522 |
sizeOfType = TIFFTag.getSizeOfType(type); |
34818
0f8792b2b1dc
8144997: "IIOException: Field data is past end-of-stream" when calling TIFFImageReader.read()
bpb
parents:
34817
diff
changeset
|
523 |
} catch (IllegalArgumentException ignored) { |
0f8792b2b1dc
8144997: "IIOException: Field data is past end-of-stream" when calling TIFFImageReader.read()
bpb
parents:
34817
diff
changeset
|
524 |
// Continue with the next IFD entry. |
0f8792b2b1dc
8144997: "IIOException: Field data is past end-of-stream" when calling TIFFImageReader.read()
bpb
parents:
34817
diff
changeset
|
525 |
stream.skipBytes(4); |
0f8792b2b1dc
8144997: "IIOException: Field data is past end-of-stream" when calling TIFFImageReader.read()
bpb
parents:
34817
diff
changeset
|
526 |
continue; |
34817
9b585ae27455
8144245: [PIT] javax/imageio/plugins/shared/WriteAfterAbort.java
bpb
parents:
34416
diff
changeset
|
527 |
} |
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
528 |
long longCount = stream.readUnsignedInt(); |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
529 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
530 |
// Get the associated TIFFTag. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
531 |
TIFFTag tag = getTag(tagNumber, tagSetList); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
532 |
|
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
533 |
// Ignore unknown fields, fields with unknown type, and fields |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
534 |
// with count out of int range. |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
535 |
if((tag == null && ignoreUnknownFields) |
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
536 |
|| (tag != null && !tag.isDataTypeOK(type)) |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
537 |
|| longCount > Integer.MAX_VALUE) { |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
538 |
// Skip the value/offset so as to leave the stream |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
539 |
// position at the start of the next IFD entry. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
540 |
stream.skipBytes(4); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
541 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
542 |
// Continue with the next IFD entry. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
543 |
continue; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
544 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
545 |
|
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
546 |
int count = (int)longCount; |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
547 |
|
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
548 |
if (tag == null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
549 |
tag = new TIFFTag(TIFFTag.UNKNOWN_TAG_NAME, tagNumber, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
550 |
1 << type, count); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
551 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
552 |
int expectedCount = tag.getCount(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
553 |
if (expectedCount > 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
554 |
// If the tag count is positive then the tag defines a |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
555 |
// specific, fixed count that the field must match. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
556 |
if (count != expectedCount) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
557 |
throw new IIOException("Unexpected count " |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
558 |
+ count + " for " + tag.getName() + " field"); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
559 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
560 |
} else if (type == TIFFTag.TIFF_ASCII) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
561 |
// Clamp the size of ASCII fields of unspecified length |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
562 |
// to a maximum value. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
563 |
int asciiSize = TIFFTag.getSizeOfType(TIFFTag.TIFF_ASCII); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
564 |
if (count*asciiSize > MAX_ASCII_SIZE) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
565 |
count = (int)(MAX_ASCII_SIZE/asciiSize); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
566 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
567 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
568 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
569 |
|
35660
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
570 |
long longSize = longCount*sizeOfType; |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
571 |
if (longSize > Integer.MAX_VALUE) { |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
572 |
// Continue with the next IFD entry. |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
573 |
stream.skipBytes(4); |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
574 |
continue; |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
575 |
} |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
576 |
int size = (int)longSize; |
471caf9d2ac0
8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image
bpb
parents:
34818
diff
changeset
|
577 |
|
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
578 |
if (size > 4 || tag.isIFDPointer()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
579 |
// The IFD entry value is a pointer to the actual field value. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
580 |
long offset = stream.readUnsignedInt(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
581 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
582 |
// Check whether the the field value is within the stream. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
583 |
if (haveStreamLength && offset + size > streamLength) { |
34818
0f8792b2b1dc
8144997: "IIOException: Field data is past end-of-stream" when calling TIFFImageReader.read()
bpb
parents:
34817
diff
changeset
|
584 |
continue; |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
585 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
586 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
587 |
// Add a TIFFIFDEntry as a placeholder. This avoids a mark, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
588 |
// seek to the data, and a reset. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
589 |
entries.add(new TIFFIFDEntry(tag, type, count, offset)); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
590 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
591 |
// The IFD entry value is the actual field value of no more than |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
592 |
// four bytes. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
593 |
Object obj = null; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
594 |
try { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
595 |
// Read the field value and update the count. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
596 |
count = readFieldValue(stream, type, count, entryData); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
597 |
obj = entryData[0]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
598 |
} catch (EOFException eofe) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
599 |
// The TIFF 6.0 fields have tag numbers less than or equal |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
600 |
// to 532 (ReferenceBlackWhite) or equal to 33432 (Copyright). |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
601 |
// If there is an error reading a baseline tag, then re-throw |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
602 |
// the exception and fail; otherwise continue with the next |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
603 |
// field. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
604 |
if (BaselineTIFFTagSet.getInstance().getTag(tagNumber) == null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
605 |
throw eofe; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
606 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
607 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
608 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
609 |
// If the field value is smaller than four bytes then skip |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
610 |
// the remaining, unused bytes. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
611 |
if (size < 4) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
612 |
stream.skipBytes(4 - size); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
613 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
614 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
615 |
// Add the populated TIFFField to the list of entries. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
616 |
entries.add(new TIFFField(tag, type, count, obj)); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
617 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
618 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
619 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
620 |
// After reading the IFD entries the stream is positioned at an unsigned |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
621 |
// four byte integer containing either the offset of the next IFD or |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
622 |
// zero if this is the last IFD. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
623 |
long nextIFDOffset = stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
624 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
625 |
Object[] fieldData = new Object[1]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
626 |
for (Object entry : entries) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
627 |
if (entry instanceof TIFFField) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
628 |
// Add the populated field directly. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
629 |
addTIFFField((TIFFField)entry); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
630 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
631 |
TIFFIFDEntry e = (TIFFIFDEntry)entry; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
632 |
TIFFTag tag = e.tag; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
633 |
int tagNumber = tag.getNumber(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
634 |
int type = e.type; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
635 |
int count = e.count; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
636 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
637 |
stream.seek(e.offset); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
638 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
639 |
if (tag.isIFDPointer()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
640 |
List<TIFFTagSet> tagSets = new ArrayList<TIFFTagSet>(1); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
641 |
tagSets.add(tag.getTagSet()); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
642 |
TIFFIFD subIFD = new TIFFIFD(tagSets); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
643 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
644 |
subIFD.initialize(stream, false, ignoreUnknownFields); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
645 |
TIFFField f = new TIFFField(tag, type, e.offset, subIFD); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
646 |
addTIFFField(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
647 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
648 |
if (tagNumber == BaselineTIFFTagSet.TAG_STRIP_BYTE_COUNTS |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
649 |
|| tagNumber == BaselineTIFFTagSet.TAG_TILE_BYTE_COUNTS |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
650 |
|| tagNumber == BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
651 |
this.stripOrTileByteCountsPosition |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
652 |
= stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
653 |
} else if (tagNumber == BaselineTIFFTagSet.TAG_STRIP_OFFSETS |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
654 |
|| tagNumber == BaselineTIFFTagSet.TAG_TILE_OFFSETS |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
655 |
|| tagNumber == BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
656 |
this.stripOrTileOffsetsPosition |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
657 |
= stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
658 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
659 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
660 |
Object obj = null; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
661 |
try { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
662 |
count = readFieldValue(stream, type, count, fieldData); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
663 |
obj = fieldData[0]; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
664 |
} catch (EOFException eofe) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
665 |
// The TIFF 6.0 fields have tag numbers less than or equal |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
666 |
// to 532 (ReferenceBlackWhite) or equal to 33432 (Copyright). |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
667 |
// If there is an error reading a baseline tag, then re-throw |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
668 |
// the exception and fail; otherwise continue with the next |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
669 |
// field. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
670 |
if (BaselineTIFFTagSet.getInstance().getTag(tagNumber) == null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
671 |
throw eofe; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
672 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
673 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
674 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
675 |
if (obj == null) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
676 |
continue; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
677 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
678 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
679 |
TIFFField f = new TIFFField(tag, type, count, obj); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
680 |
addTIFFField(f); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
681 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
682 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
683 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
684 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
685 |
if(isPrimaryIFD && haveStreamLength) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
686 |
checkFieldOffsets(streamLength); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
687 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
688 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
689 |
stream.seek(nextIFDOffset); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
690 |
this.lastPosition = stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
691 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
692 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
693 |
public void writeToStream(ImageOutputStream stream) |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
694 |
throws IOException { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
695 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
696 |
int numFields = getNumTIFFFields(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
697 |
stream.writeShort(numFields); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
698 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
699 |
long nextSpace = stream.getStreamPosition() + 12*numFields + 4; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
700 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
701 |
Iterator<TIFFField> iter = iterator(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
702 |
while (iter.hasNext()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
703 |
TIFFField f = iter.next(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
704 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
705 |
TIFFTag tag = f.getTag(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
706 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
707 |
int type = f.getType(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
708 |
int count = f.getCount(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
709 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
710 |
// Deal with unknown tags |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
711 |
if (type == 0) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
712 |
type = TIFFTag.TIFF_UNDEFINED; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
713 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
714 |
int size = count*TIFFTag.getSizeOfType(type); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
715 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
716 |
if (type == TIFFTag.TIFF_ASCII) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
717 |
int chars = 0; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
718 |
for (int i = 0; i < count; i++) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
719 |
chars += f.getAsString(i).length() + 1; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
720 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
721 |
count = chars; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
722 |
size = count; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
723 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
724 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
725 |
int tagNumber = f.getTagNumber(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
726 |
stream.writeShort(tagNumber); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
727 |
stream.writeShort(type); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
728 |
stream.writeInt(count); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
729 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
730 |
// Write a dummy value to fill space |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
731 |
stream.writeInt(0); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
732 |
stream.mark(); // Mark beginning of next field |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
733 |
stream.skipBytes(-4); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
734 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
735 |
long pos; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
736 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
737 |
if (size > 4 || tag.isIFDPointer()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
738 |
// Ensure IFD or value is written on a word boundary |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
739 |
nextSpace = (nextSpace + 3) & ~0x3; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
740 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
741 |
stream.writeInt((int)nextSpace); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
742 |
stream.seek(nextSpace); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
743 |
pos = nextSpace; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
744 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
745 |
if (tag.isIFDPointer() && f.hasDirectory()) { |
40442
e97e9982be6d
8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
bpb
parents:
36448
diff
changeset
|
746 |
TIFFIFD subIFD = getDirectoryAsIFD(f.getDirectory()); |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
747 |
subIFD.writeToStream(stream); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
748 |
nextSpace = subIFD.lastPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
749 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
750 |
writeTIFFFieldToStream(f, stream); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
751 |
nextSpace = stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
752 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
753 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
754 |
pos = stream.getStreamPosition(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
755 |
writeTIFFFieldToStream(f, stream); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
756 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
757 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
758 |
// If we are writing the data for the |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
759 |
// StripByteCounts, TileByteCounts, StripOffsets, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
760 |
// TileOffsets, JPEGInterchangeFormat, or |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
761 |
// JPEGInterchangeFormatLength fields, record the current stream |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
762 |
// position for backpatching |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
763 |
if (tagNumber == |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
764 |
BaselineTIFFTagSet.TAG_STRIP_BYTE_COUNTS || |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
765 |
tagNumber == BaselineTIFFTagSet.TAG_TILE_BYTE_COUNTS || |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
766 |
tagNumber == BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
767 |
this.stripOrTileByteCountsPosition = pos; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
768 |
} else if (tagNumber == |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
769 |
BaselineTIFFTagSet.TAG_STRIP_OFFSETS || |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
770 |
tagNumber == |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
771 |
BaselineTIFFTagSet.TAG_TILE_OFFSETS || |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
772 |
tagNumber == |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
773 |
BaselineTIFFTagSet.TAG_JPEG_INTERCHANGE_FORMAT) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
774 |
this.stripOrTileOffsetsPosition = pos; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
775 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
776 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
777 |
stream.reset(); // Go to marked position of next field |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
778 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
779 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
780 |
this.lastPosition = nextSpace; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
781 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
782 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
783 |
public long getStripOrTileByteCountsPosition() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
784 |
return stripOrTileByteCountsPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
785 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
786 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
787 |
public long getStripOrTileOffsetsPosition() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
788 |
return stripOrTileOffsetsPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
789 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
790 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
791 |
public long getLastPosition() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
792 |
return lastPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
793 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
794 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
795 |
void setPositions(long stripOrTileOffsetsPosition, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
796 |
long stripOrTileByteCountsPosition, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
797 |
long lastPosition) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
798 |
this.stripOrTileOffsetsPosition = stripOrTileOffsetsPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
799 |
this.stripOrTileByteCountsPosition = stripOrTileByteCountsPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
800 |
this.lastPosition = lastPosition; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
801 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
802 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
803 |
/** |
36448
a07e108d5722
8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes
bpb
parents:
35660
diff
changeset
|
804 |
* Returns a {@code TIFFIFD} wherein all fields from the |
a07e108d5722
8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes
bpb
parents:
35660
diff
changeset
|
805 |
* {@code BaselineTIFFTagSet} are copied by value and all other |
34416
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
806 |
* fields copied by reference. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
807 |
*/ |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
808 |
public TIFFIFD getShallowClone() { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
809 |
// Get the baseline TagSet. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
810 |
TIFFTagSet baselineTagSet = BaselineTIFFTagSet.getInstance(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
811 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
812 |
// If the baseline TagSet is not included just return. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
813 |
List<TIFFTagSet> tagSetList = getTagSetList(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
814 |
if(!tagSetList.contains(baselineTagSet)) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
815 |
return this; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
816 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
817 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
818 |
// Create a new object. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
819 |
TIFFIFD shallowClone = new TIFFIFD(tagSetList, getParentTag()); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
820 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
821 |
// Get the tag numbers in the baseline set. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
822 |
Set<Integer> baselineTagNumbers = baselineTagSet.getTagNumbers(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
823 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
824 |
// Iterate over the fields in this IFD. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
825 |
Iterator<TIFFField> fields = iterator(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
826 |
while(fields.hasNext()) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
827 |
// Get the next field. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
828 |
TIFFField field = fields.next(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
829 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
830 |
// Get its tag number. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
831 |
Integer tagNumber = Integer.valueOf(field.getTagNumber()); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
832 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
833 |
// Branch based on membership in baseline set. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
834 |
TIFFField fieldClone; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
835 |
if(baselineTagNumbers.contains(tagNumber)) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
836 |
// Copy by value. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
837 |
Object fieldData = field.getData(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
838 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
839 |
int fieldType = field.getType(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
840 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
841 |
try { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
842 |
switch (fieldType) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
843 |
case TIFFTag.TIFF_BYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
844 |
case TIFFTag.TIFF_SBYTE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
845 |
case TIFFTag.TIFF_UNDEFINED: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
846 |
fieldData = ((byte[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
847 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
848 |
case TIFFTag.TIFF_ASCII: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
849 |
fieldData = ((String[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
850 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
851 |
case TIFFTag.TIFF_SHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
852 |
fieldData = ((char[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
853 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
854 |
case TIFFTag.TIFF_LONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
855 |
case TIFFTag.TIFF_IFD_POINTER: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
856 |
fieldData = ((long[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
857 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
858 |
case TIFFTag.TIFF_RATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
859 |
fieldData = ((long[][])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
860 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
861 |
case TIFFTag.TIFF_SSHORT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
862 |
fieldData = ((short[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
863 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
864 |
case TIFFTag.TIFF_SLONG: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
865 |
fieldData = ((int[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
866 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
867 |
case TIFFTag.TIFF_SRATIONAL: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
868 |
fieldData = ((int[][])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
869 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
870 |
case TIFFTag.TIFF_FLOAT: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
871 |
fieldData = ((float[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
872 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
873 |
case TIFFTag.TIFF_DOUBLE: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
874 |
fieldData = ((double[])fieldData).clone(); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
875 |
break; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
876 |
default: |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
877 |
// Shouldn't happen but do nothing ... |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
878 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
879 |
} catch(Exception e) { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
880 |
// Ignore it and copy by reference ... |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
881 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
882 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
883 |
fieldClone = new TIFFField(field.getTag(), fieldType, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
884 |
field.getCount(), fieldData); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
885 |
} else { |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
886 |
// Copy by reference. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
887 |
fieldClone = field; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
888 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
889 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
890 |
// Add the field to the clone. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
891 |
shallowClone.addTIFFField(fieldClone); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
892 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
893 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
894 |
// Set positions. |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
895 |
shallowClone.setPositions(stripOrTileOffsetsPosition, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
896 |
stripOrTileByteCountsPosition, |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
897 |
lastPosition); |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
898 |
|
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
899 |
return shallowClone; |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
900 |
} |
68c0d866db5d
8143342: Integrate Java Image I/O support for TIFF per JEP 262
bpb
parents:
diff
changeset
|
901 |
} |