Chroma - The ColorSpaceType subnode of a
Chroma node may change the target colorspace of the
compressed image. The selection of a new colorspace can cause a number
- of changes, in keeping with the algorithms described above:
+ of changes, in keeping with the algorithms described above:
app0JFIF and app14Adobe nodes may be added
or removed, subsampling may be added or removed, component ids may
be changed, and sof and sos nodes will be
@@ -871,17 +869,17 @@
setFromTree - Native Format
-The setFromTree operation, when given a tree in the native
-format described below, will simply replace the existing tree in its entirety
+The setFromTree operation, when given a tree in the native
+format described below, will simply replace the existing tree in its entirety
with the new one. The tree must consist of IIOMetadataNodes.
setFromTree - Standard Format
-The setFromTree operation, when given a tree in the standard
+The setFromTree operation, when given a tree in the standard
format, performs a reset followed by a merge of the new tree.
@@ -891,39 +889,39 @@
<!ELEMENT "JPEGvariety" (app0JFIF)>
<!-- A node grouping all marker segments specific to the variety of
- stream being read/written (e.g. JFIF) - may be empty -->
+ stream being read/written (e.g. JFIF) - may be empty -->
<!ELEMENT "app0JFIF" (JFXX?, app2ICC?)>
<!ATTLIST "app0JFIF" "majorVersion" #CDATA "1">
- <!-- The major JFIF version number -->
+ <!-- The major JFIF version number -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "app0JFIF" "minorVersion" #CDATA "2">
- <!-- The minor JFIF version number -->
+ <!-- The minor JFIF version number -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "app0JFIF" "resUnits" ("0" | "1" | "2") "0">
- <!-- The resolution units for Xdensisty and Ydensity (0 = no
- units, just aspect ratio; 1 = dots/inch; 2 = dots/cm) -->
+ <!-- The resolution units for Xdensisty and Ydensity (0 = no
+ units, just aspect ratio; 1 = dots/inch; 2 = dots/cm) -->
<!ATTLIST "app0JFIF" "Xdensity" #CDATA "1">
- <!-- The horizontal density or aspect ratio numerator -->
+ <!-- The horizontal density or aspect ratio numerator -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "app0JFIF" "Ydensity" #CDATA "1">
- <!-- The vertical density or aspect ratio denominator -->
+ <!-- The vertical density or aspect ratio denominator -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "app0JFIF" "thumbWidth" #CDATA "0">
- <!-- The width of the thumbnail, or 0 if there isn't one -->
+ <!-- The width of the thumbnail, or 0 if there isn't one -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "app0JFIF" "thumbHeight" #CDATA "0">
- <!-- The height of the thumbnail, or 0 if there isn't one -->
+ <!-- The height of the thumbnail, or 0 if there isn't one -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
@@ -931,233 +929,233 @@
<!ELEMENT "JFXX" (app0JFXX)*>
<!-- Min children: 1 -->
- <!ELEMENT "app0JFXX" (JFIFthumbJPEG | JFIFthumbPalette |
+ <!ELEMENT "app0JFXX" (JFIFthumbJPEG | JFIFthumbPalette |
JFIFthumbRGB)>
- <!-- A JFIF extension marker segment -->
+ <!-- A JFIF extension marker segment -->
<!ATTLIST "app0JFXX" "extensionCode" ("16" | "17" | "19")
#IMPLIED>
- <!-- The JFXX extension code identifying thumbnail type: (16 =
- JPEG, 17 = indexed, 19 = RGB -->
+ <!-- The JFXX extension code identifying thumbnail type: (16 =
+ JPEG, 17 = indexed, 19 = RGB -->
<!ELEMENT "JFIFthumbJPEG" (markerSequence?)>
- <!-- A JFIF thumbnail in JPEG format (no JFIF segments
- permitted) -->
+ <!-- A JFIF thumbnail in JPEG format (no JFIF segments
+ permitted) -->
<!ELEMENT "JFIFthumbPalette" EMPTY>
- <!-- A JFIF thumbnail as an RGB indexed image -->
+ <!-- A JFIF thumbnail as an RGB indexed image -->
<!ATTLIST "JFIFthumbPalette" "thumbWidth" #CDATA #IMPLIED>
- <!-- The width of the thumbnail -->
+ <!-- The width of the thumbnail -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "JFIFthumbPalette" "thumbHeight" #CDATA #IMPLIED>
- <!-- The height of the thumbnail -->
+ <!-- The height of the thumbnail -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ELEMENT "JFIFthumbRGB" EMPTY>
- <!-- A JFIF thumbnail as an RGB image -->
+ <!-- A JFIF thumbnail as an RGB image -->
<!ATTLIST "JFIFthumbRGB" "thumbWidth" #CDATA #IMPLIED>
- <!-- The width of the thumbnail -->
+ <!-- The width of the thumbnail -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "JFIFthumbRGB" "thumbHeight" #CDATA #IMPLIED>
- <!-- The height of the thumbnail -->
+ <!-- The height of the thumbnail -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ELEMENT "app2ICC" EMPTY>
- <!-- An ICC profile APP2 marker segment -->
+ <!-- An ICC profile APP2 marker segment -->
<!-- Optional User object: java.awt.color.ICC_Profile -->
- <!ELEMENT "markerSequence" (dqt | dht | dri | com | unknown |
+ <!ELEMENT "markerSequence" (dqt | dht | dri | com | unknown |
app14Adobe | sof | sos)*>
- <!-- A node grouping all non-jfif marker segments -->
+ <!-- A node grouping all non-jfif marker segments -->
<!ELEMENT "dqt" (dqtable)*>
- <!-- A Define Quantization Table(s) marker segment -->
+ <!-- A Define Quantization Table(s) marker segment -->
<!-- Min children: 1 -->
<!-- Max children: 4 -->
<!ELEMENT "dqtable" EMPTY>
- <!-- A single quantization table -->
+ <!-- A single quantization table -->
<!-- User object: javax.imageio.plugins.jpeg.JPEGQTable -->
<!ATTLIST "dqtable" "elementPrecision" #CDATA "0">
- <!-- The number of bits in each table element (0 = 8, 1 = 16)
- -->
+ <!-- The number of bits in each table element (0 = 8, 1 = 16)
+ -->
<!-- Data type: Integer -->
<!ATTLIST "dqtable" "qtableId" ("0" | "1" | "2" | "3") #REQUIRED>
<!ELEMENT "dht" (dhtable)*>
- <!-- A Define Huffman Table(s) marker segment -->
+ <!-- A Define Huffman Table(s) marker segment -->
<!-- Min children: 1 -->
<!-- Max children: 4 -->
<!ELEMENT "dhtable" EMPTY>
- <!-- A single Huffman table -->
+ <!-- A single Huffman table -->
<!-- User object: javax.imageio.plugins.jpeg.JPEGHuffmanTable -->
<!ATTLIST "dhtable" "class" ("0" | "1") #REQUIRED>
- <!-- Indicates whether this is a DC (0) or an AC (1) table -->
+ <!-- Indicates whether this is a DC (0) or an AC (1) table -->
<!ATTLIST "dhtable" "htableId" ("0" | "1" | "2" | "3") #REQUIRED>
- <!-- The table id -->
+ <!-- The table id -->
<!ELEMENT "dri" EMPTY>
- <!-- A Define Restart Interval marker segment -->
+ <!-- A Define Restart Interval marker segment -->
<!ATTLIST "dri" "interval" #CDATA #REQUIRED>
- <!-- The restart interval in MCUs -->
+ <!-- The restart interval in MCUs -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ELEMENT "com" EMPTY>
- <!-- A Comment marker segment. The user object contains the actual
- bytes. -->
+ <!-- A Comment marker segment. The user object contains the actual
+ bytes. -->
<!-- User object: array of [B -->
<!-- Min length: 1 -->
<!-- Max length: 65533 -->
<!ATTLIST "com" "comment" #CDATA #IMPLIED>
- <!-- The comment as a string (used only if user object is null)
- -->
+ <!-- The comment as a string (used only if user object is null)
+ -->
<!-- Data type: String -->
<!ELEMENT "unknown" EMPTY>
- <!-- An unrecognized marker segment. The user object contains the
- data not including length. -->
+ <!-- An unrecognized marker segment. The user object contains the
+ data not including length. -->
<!-- User object: array of [B -->
<!-- Min length: 1 -->
<!-- Max length: 65533 -->
<!ATTLIST "unknown" "MarkerTag" #CDATA #REQUIRED>
- <!-- The tag identifying this marker segment -->
+ <!-- The tag identifying this marker segment -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ELEMENT "app14Adobe" EMPTY>
- <!-- An Adobe APP14 marker segment -->
+ <!-- An Adobe APP14 marker segment -->
<!ATTLIST "app14Adobe" "version" #CDATA "100">
- <!-- The version of Adobe APP14 marker segment -->
+ <!-- The version of Adobe APP14 marker segment -->
<!-- Data type: Integer -->
<!-- Min value: 100 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "app14Adobe" "flags0" #CDATA "0">
- <!-- The flags0 variable of an APP14 marker segment -->
+ <!-- The flags0 variable of an APP14 marker segment -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "app14Adobe" "flags1" #CDATA "0">
- <!-- The flags1 variable of an APP14 marker segment -->
+ <!-- The flags1 variable of an APP14 marker segment -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "app14Adobe" "transform" ("0" | "1" | "2") #REQUIRED>
- <!-- The color transform applied to the image (0 = Unknown, 1 =
- YCbCr, 2 = YCCK) -->
+ <!-- The color transform applied to the image (0 = Unknown, 1 =
+ YCbCr, 2 = YCCK) -->
<!ELEMENT "sof" (componentSpec)*>
- <!-- A Start Of Frame marker segment -->
+ <!-- A Start Of Frame marker segment -->
<!-- Min children: 1 -->
<!-- Max children: 4 -->
<!ATTLIST "sof" "process" ("0" | "1" | "2") #IMPLIED>
- <!-- The JPEG process (0 = Baseline sequential, 1 = Extended
- sequential, 2 = Progressive) -->
+ <!-- The JPEG process (0 = Baseline sequential, 1 = Extended
+ sequential, 2 = Progressive) -->
<!ATTLIST "sof" "samplePrecision" #CDATA "8">
- <!-- The number of bits per sample -->
+ <!-- The number of bits per sample -->
<!-- Data type: Integer -->
<!ATTLIST "sof" "numLines" #CDATA #IMPLIED>
- <!-- The number of lines in the image -->
+ <!-- The number of lines in the image -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "sof" "samplesPerLine" #CDATA #IMPLIED>
- <!-- The number of samples per line -->
+ <!-- The number of samples per line -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 65535 (inclusive) -->
<!ATTLIST "sof" "numFrameComponents" ("1" | "2" | "3" | "4")
#IMPLIED>
- <!-- The number of components in the image -->
+ <!-- The number of components in the image -->
<!ELEMENT "componentSpec" EMPTY>
- <!-- A component specification for a frame -->
+ <!-- A component specification for a frame -->
<!ATTLIST "componentSpec" "componentId" #CDATA #REQUIRED>
- <!-- The id for this component -->
+ <!-- The id for this component -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "componentSpec" "HsamplingFactor" #CDATA #REQUIRED>
- <!-- The horizontal sampling factor for this component -->
+ <!-- The horizontal sampling factor for this component -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
<!ATTLIST "componentSpec" "VsamplingFactor" #CDATA #REQUIRED>
- <!-- The vertical sampling factor for this component -->
+ <!-- The vertical sampling factor for this component -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
- <!ATTLIST "componentSpec" "QtableSelector" ("0" | "1" | "2" |
+ <!ATTLIST "componentSpec" "QtableSelector" ("0" | "1" | "2" |
"3") #REQUIRED>
- <!-- The quantization table to use for this component -->
+ <!-- The quantization table to use for this component -->
<!ELEMENT "sos" (scanComponentSpec)*>
- <!-- A Start Of Scan marker segment -->
+ <!-- A Start Of Scan marker segment -->
<!-- Min children: 1 -->
<!-- Max children: 4 -->
<!ATTLIST "sos" "numScanComponents" ("1" | "2" | "3" | "4")
#REQUIRED>
- <!-- The number of components in the scan -->
+ <!-- The number of components in the scan -->
<!ATTLIST "sos" "startSpectralSelection" #CDATA "0">
- <!-- The first spectral band included in this scan -->
+ <!-- The first spectral band included in this scan -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 63 (inclusive) -->
<!ATTLIST "sos" "endSpectralSelection" #CDATA "63">
- <!-- The last spectral band included in this scan -->
+ <!-- The last spectral band included in this scan -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 63 (inclusive) -->
<!ATTLIST "sos" "approxHigh" #CDATA "0">
- <!-- The highest bit position included in this scan -->
+ <!-- The highest bit position included in this scan -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 15 (inclusive) -->
<!ATTLIST "sos" "approxLow" #CDATA "0">
- <!-- The lowest bit position included in this scan -->
+ <!-- The lowest bit position included in this scan -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 15 (inclusive) -->
<!ELEMENT "scanComponentSpec" EMPTY>
- <!-- A component specification for a scan -->
+ <!-- A component specification for a scan -->
<!ATTLIST "scanComponentSpec" "componentSelector" #CDATA
#REQUIRED>
- <!-- The id of this component -->
+ <!-- The id of this component -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 255 (inclusive) -->
- <!ATTLIST "scanComponentSpec" "dcHuffTable" ("0" | "1" | "2" |
+ <!ATTLIST "scanComponentSpec" "dcHuffTable" ("0" | "1" | "2" |
"3") #REQUIRED>
- <!-- The huffman table to use for encoding DC coefficients -->
- <!ATTLIST "scanComponentSpec" "acHuffTable" ("0" | "1" | "2" |
+ <!-- The huffman table to use for encoding DC coefficients -->
+ <!ATTLIST "scanComponentSpec" "acHuffTable" ("0" | "1" | "2" |
"3") #REQUIRED>
- <!-- The huffman table to use for encoding AC coefficients -->
+ <!-- The huffman table to use for encoding AC coefficients -->
]>
<!DOCTYPE "javax_imageio_jpeg_stream_1.0" [
<!ELEMENT "javax_imageio_jpeg_stream_1.0" (dqt |
- dht |
- dri |
- com |
+ dht |
+ dri |
+ com |
unknown)*>
-
+
<!-- All elements are as defined above for image metadata -->
]>
--- old/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html 2017-10-23 13:51:07.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html 2017-10-23 13:51:07.000000000 -0700
@@ -1,8 +1,11 @@
-
-
+
+
+
+ PNG Metadata Format Specification
+
-PNG Metadata Format Specification
-
-
-
+
-
-PNG Metadata Format Specification
-
+PNG Metadata Format Specification
@@ -59,7 +57,7 @@
type set in the metadata is "Palette", palette color will be used.
-
+
If no metadata is supplied when encoding an image, the header is
initialized from the image being encoded, and no optional chunks are
included.
@@ -85,7 +83,7 @@
The child nodes of the bKGD, sBIT, and
tRNS chunks must match the image's color type.
-
+
Certain chunks may meaningfully appear multiple times in a PNG file,
in particular the text-related chunks. In order to simplify the
@@ -104,8 +102,8 @@
<!DOCTYPE "javax_imageio_png_1.0" [
- <!ELEMENT "javax_imageio_png_1.0" (IHDR?, PLTE?, bKGD?, cHRM?,
- gAMA?, hIST?, iCCP?, iTXt?, pHYS?, sBIT?, sPLT?, sRGB?, tEXt?,
+ <!ELEMENT "javax_imageio_png_1.0" (IHDR?, PLTE?, bKGD?, cHRM?,
+ gAMA?, hIST?, iCCP?, iTXt?, pHYS?, sBIT?, sPLT?, sRGB?, tEXt?,
tIME?, tRNS?, zTXt?, UnknownChunks?)>
<!ELEMENT "IHDR" EMPTY>
@@ -123,7 +121,7 @@
<!ATTLIST "IHDR" "bitDepth" ("1" | "2" | "4" | "8" | "16")
#REQUIRED>
<!-- The bit depth of the image samples -->
- <!ATTLIST "IHDR" "colorType" ("Grayscale" | "RGB" | "Palette" |
+ <!ATTLIST "IHDR" "colorType" ("Grayscale" | "RGB" | "Palette" |
"GrayAlpha" | "RGBAlpha") #REQUIRED>
<!-- The color type of the image -->
<!ATTLIST "IHDR" "compressionMethod" ("deflate") #REQUIRED>
@@ -318,7 +316,7 @@
<!ATTLIST "pHYS" "unitSpecifier" ("unknown" | "meter") #REQUIRED>
<!-- The unit specifier for this chunk (i.e., meters) -->
- <!ELEMENT "sBIT" (sBIT_Grayscale | sBIT_GrayAlpha | sBIT_RGB |
+ <!ELEMENT "sBIT" (sBIT_Grayscale | sBIT_GrayAlpha | sBIT_RGB |
sBIT_RGBAlpha | sBIT_Palette)>
<!-- The sBIT chunk, containing significant bit information -->
@@ -437,8 +435,8 @@
<!ELEMENT "sRGB" EMPTY>
<!-- The sRGB chunk, containing rendering intent information -->
- <!ATTLIST "sRGB" "renderingIntent" ("Perceptual" |
- "Relative colorimetric" | "Saturation" |
+ <!ATTLIST "sRGB" "renderingIntent" ("Perceptual" |
+ "Relative colorimetric" | "Saturation" |
"Absolute colorimetric") #REQUIRED>
<!-- The rendering intent -->
--- old/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html 2017-10-23 13:51:08.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html 2017-10-23 13:51:08.000000000 -0700
@@ -1,8 +1,11 @@
-
-
+
+
+
+ Standard Metadata Format Specification
+
-Standard Metadata Format Specification
-
-
-
+
-
-Standard (Plug-in Neutral) Metadata Format Specification
-
+Standard (Plug-in Neutral) Metadata Format Specification
The plug-in neutral "javax_imageio_1.0" format consists
of a root node named "javax_imageio_1.0" which has child
@@ -44,355 +42,355 @@
<!DOCTYPE "javax_imageio_1.0" [
- <!ELEMENT "javax_imageio_1.0" (Chroma?, Compression?, Data?, Dimension?,
+ <!ELEMENT "javax_imageio_1.0" (Chroma?, Compression?, Data?, Dimension?,
Document?, Text?, Transparency?)>
- <!ELEMENT "Chroma" (ColorSpaceType?, NumChannels?, Gamma?,
+ <!ELEMENT "Chroma" (ColorSpaceType?, NumChannels?, Gamma?,
BlackIsZero?, Palette?, BackgroundIndex?, BackgroundColor?)>
- <!-- Chroma (color) information -->
+ <!-- Chroma (color) information -->
<!ELEMENT "ColorSpaceType" EMPTY>
- <!-- The raw color space of the image -->
- <!ATTLIST "ColorSpaceType" "name" ("XYZ" | "Lab" | "Luv" |
- "YCbCr" | "Yxy" | "YCCK" | "PhotoYCC" | "RGB" | "GRAY" | "HSV" |
- "HLS" | "CMYK" | "CMY" | "2CLR" | "3CLR" | "4CLR" | "5CLR" |
- "6CLR" | "7CLR" | "8CLR" | "9CLR" | "ACLR" | "BCLR" | "CCLR" |
+ <!-- The raw color space of the image -->
+ <!ATTLIST "ColorSpaceType" "name" ("XYZ" | "Lab" | "Luv" |
+ "YCbCr" | "Yxy" | "YCCK" | "PhotoYCC" | "RGB" | "GRAY" | "HSV" |
+ "HLS" | "CMYK" | "CMY" | "2CLR" | "3CLR" | "4CLR" | "5CLR" |
+ "6CLR" | "7CLR" | "8CLR" | "9CLR" | "ACLR" | "BCLR" | "CCLR" |
"DCLR" | "ECLR" | "FCLR") #REQUIRED>
<!ELEMENT "NumChannels" EMPTY>
- <!-- The number of channels in the raw image, including alpha -->
+ <!-- The number of channels in the raw image, including alpha -->
<!ATTLIST "NumChannels" "value" #CDATA #REQUIRED>
<!-- Data type: List of Integer -->
<!ELEMENT "Gamma" EMPTY>
- <!-- The image gamma -->
+ <!-- The image gamma -->
<!ATTLIST "Gamma" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "BlackIsZero" EMPTY>
- <!-- True if smaller values represent darker shades -->
+ <!-- True if smaller values represent darker shades -->
<!ATTLIST "BlackIsZero" "value" ("TRUE" | "FALSE") "TRUE">
<!ELEMENT "Palette" (PaletteEntry)*>
- <!-- Palette-color information -->
+ <!-- Palette-color information -->
<!ELEMENT "PaletteEntry" EMPTY>
- <!-- A palette entry -->
+ <!-- A palette entry -->
<!ATTLIST "PaletteEntry" "index" #CDATA #REQUIRED>
- <!-- The index of the palette entry -->
+ <!-- The index of the palette entry -->
<!-- Data type: Integer -->
<!ATTLIST "PaletteEntry" "red" #CDATA #REQUIRED>
- <!-- The red value for the palette entry -->
+ <!-- The red value for the palette entry -->
<!-- Data type: Integer -->
<!ATTLIST "PaletteEntry" "green" #CDATA #REQUIRED>
- <!-- The green value for the palette entry -->
+ <!-- The green value for the palette entry -->
<!-- Data type: Integer -->
<!ATTLIST "PaletteEntry" "blue" #CDATA #REQUIRED>
- <!-- The blue value for the palette entry -->
+ <!-- The blue value for the palette entry -->
<!-- Data type: Integer -->
<!ATTLIST "PaletteEntry" "alpha" #CDATA "255">
- <!-- The alpha value for the palette entry -->
+ <!-- The alpha value for the palette entry -->
<!-- Data type: Integer -->
<!ELEMENT "BackgroundIndex" EMPTY>
- <!-- A palette index to be used as a background -->
+ <!-- A palette index to be used as a background -->
<!ATTLIST "BackgroundIndex" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "BackgroundColor" EMPTY>
- <!-- An RGB triple to be used as a background -->
+ <!-- An RGB triple to be used as a background -->
<!ATTLIST "BackgroundColor" "red" #CDATA #REQUIRED>
- <!-- The red background value -->
+ <!-- The red background value -->
<!-- Data type: Integer -->
<!ATTLIST "BackgroundColor" "green" #CDATA #REQUIRED>
- <!-- The green background value -->
+ <!-- The green background value -->
<!-- Data type: Integer -->
<!ATTLIST "BackgroundColor" "blue" #CDATA #REQUIRED>
- <!-- The blue background value -->
+ <!-- The blue background value -->
<!-- Data type: Integer -->
- <!ELEMENT "Compression" (CompressionTypeName?, Lossless?,
+ <!ELEMENT "Compression" (CompressionTypeName?, Lossless?,
NumProgressiveScans?, BitRate?)>
- <!-- Compression information -->
+ <!-- Compression information -->
<!ELEMENT "CompressionTypeName" EMPTY>
- <!-- The name of the compression scheme in use -->
+ <!-- The name of the compression scheme in use -->
<!ATTLIST "CompressionTypeName" "value" #CDATA #REQUIRED>
<!-- Data type: String -->
<!ELEMENT "Lossless" EMPTY>
- <!-- True if the compression scheme is lossless -->
+ <!-- True if the compression scheme is lossless -->
<!ATTLIST "Lossless" "value" ("TRUE" | "FALSE") "TRUE">
<!ELEMENT "NumProgressiveScans" EMPTY>
- <!-- The number of progressive scans used in the image encoding -->
+ <!-- The number of progressive scans used in the image encoding -->
<!ATTLIST "NumProgressiveScans" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "BitRate" EMPTY>
- <!-- The estimated bit rate of the compression scheme -->
+ <!-- The estimated bit rate of the compression scheme -->
<!ATTLIST "BitRate" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
- <!ELEMENT "Data" (PlanarConfiguration?, SampleFormat?, BitsPerSample?,
+ <!ELEMENT "Data" (PlanarConfiguration?, SampleFormat?, BitsPerSample?,
SignificantBitsPerSample?, SampleMSB?)>
- <!-- Information on the image layout -->
+ <!-- Information on the image layout -->
<!ELEMENT "PlanarConfiguration" EMPTY>
- <!-- The organization of image samples in the stream -->
- <!ATTLIST "PlanarConfiguration" "value" ("PixelInterleaved" |
+ <!-- The organization of image samples in the stream -->
+ <!ATTLIST "PlanarConfiguration" "value" ("PixelInterleaved" |
"PlaneInterleaved" | "LineInterleaved" | "TileInterleaved")
#REQUIRED>
<!ELEMENT "SampleFormat" EMPTY>
- <!-- The numeric format of image samples -->
- <!ATTLIST "SampleFormat" "value" ("SignedIntegral" |
+ <!-- The numeric format of image samples -->
+ <!ATTLIST "SampleFormat" "value" ("SignedIntegral" |
"UnsignedIntegral" | "Real" | "Index") #REQUIRED>
<!ELEMENT "BitsPerSample" EMPTY>
- <!-- The number of bits per sample -->
+ <!-- The number of bits per sample -->
<!ATTLIST "BitsPerSample" "value" #CDATA #REQUIRED>
- <!-- A list of integers, one per channel -->
+ <!-- A list of integers, one per channel -->
<!-- Data type: List of Integer -->
<!-- Min length: 1 -->
<!ELEMENT "SignificantBitsPerSample" EMPTY>
- <!-- The number of significant bits per sample -->
+ <!-- The number of significant bits per sample -->
<!ATTLIST "SignificantBitsPerSample" "value" #CDATA #REQUIRED>
- <!-- A list of integers, one per channel -->
+ <!-- A list of integers, one per channel -->
<!-- Data type: List of Integer -->
<!-- Min length: 1 -->
<!ELEMENT "SampleMSB" EMPTY>
- <!-- The position of the most significant bit of each sample -->
+ <!-- The position of the most significant bit of each sample -->
<!ATTLIST "SampleMSB" "value" #CDATA #REQUIRED>
- <!-- A list of integers, one per channel -->
+ <!-- A list of integers, one per channel -->
<!-- Data type: List of Integer -->
<!-- Min length: 1 -->
- <!ELEMENT "Dimension" (PixelAspectRatio?, ImageOrientation?,
- HorizontalPixelSize?, VerticalPixelSize?,
- HorizontalPhysicalPixelSpacing?, VerticalPhysicalPixelSpacing?,
- HorizontalPosition?, VerticalPosition?, HorizontalPixelOffset?,
+ <!ELEMENT "Dimension" (PixelAspectRatio?, ImageOrientation?,
+ HorizontalPixelSize?, VerticalPixelSize?,
+ HorizontalPhysicalPixelSpacing?, VerticalPhysicalPixelSpacing?,
+ HorizontalPosition?, VerticalPosition?, HorizontalPixelOffset?,
VerticalPixelOffset?, HorizontalScreenSize?, VerticalScreenSize?)>
- <!-- Dimension information -->
+ <!-- Dimension information -->
<!ELEMENT "PixelAspectRatio" EMPTY>
- <!-- The width of a pixel divided by its height -->
+ <!-- The width of a pixel divided by its height -->
<!ATTLIST "PixelAspectRatio" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "ImageOrientation" EMPTY>
- <!-- The desired orientation of the image in terms of flips and
- counter-clockwise rotations -->
- <!ATTLIST "ImageOrientation" "value" ("Normal" | "Rotate90" |
- "Rotate180" | "Rotate270" | "FlipH" | "FlipV" |
+ <!-- The desired orientation of the image in terms of flips and
+ counter-clockwise rotations -->
+ <!ATTLIST "ImageOrientation" "value" ("Normal" | "Rotate90" |
+ "Rotate180" | "Rotate270" | "FlipH" | "FlipV" |
"FlipHRotate90" | "FlipVRotate90") #REQUIRED>
<!ELEMENT "HorizontalPixelSize" EMPTY>
- <!-- The width of a pixel, in millimeters, as it should be rendered
- on media -->
+ <!-- The width of a pixel, in millimeters, as it should be rendered
+ on media -->
<!ATTLIST "HorizontalPixelSize" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "VerticalPixelSize" EMPTY>
- <!-- The height of a pixel, in millimeters, as it should be
- rendered on media -->
+ <!-- The height of a pixel, in millimeters, as it should be
+ rendered on media -->
<!ATTLIST "VerticalPixelSize" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "HorizontalPhysicalPixelSpacing" EMPTY>
- <!-- The horizontal distance in the subject of the image, in
- millimeters, represented by one pixel at the center of the
- image -->
+ <!-- The horizontal distance in the subject of the image, in
+ millimeters, represented by one pixel at the center of the
+ image -->
<!ATTLIST "HorizontalPhysicalPixelSpacing" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "VerticalPhysicalPixelSpacing" EMPTY>
- <!-- The vertical distance in the subject of the image, in
- millimeters, represented by one pixel at the center of the
- image -->
+ <!-- The vertical distance in the subject of the image, in
+ millimeters, represented by one pixel at the center of the
+ image -->
<!ATTLIST "VerticalPhysicalPixelSpacing" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "HorizontalPosition" EMPTY>
- <!-- The horizontal position, in millimeters, where the image
- should be rendered on media -->
+ <!-- The horizontal position, in millimeters, where the image
+ should be rendered on media -->
<!ATTLIST "HorizontalPosition" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "VerticalPosition" EMPTY>
- <!-- The vertical position, in millimeters, where the image should
- be rendered on media -->
+ <!-- The vertical position, in millimeters, where the image should
+ be rendered on media -->
<!ATTLIST "VerticalPosition" "value" #CDATA #REQUIRED>
<!-- Data type: Float -->
<!ELEMENT "HorizontalPixelOffset" EMPTY>
- <!-- The horizontal position, in pixels, where the image should be
- rendered onto a raster display -->
+ <!-- The horizontal position, in pixels, where the image should be
+ rendered onto a raster display -->
<!ATTLIST "HorizontalPixelOffset" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "VerticalPixelOffset" EMPTY>
- <!-- The vertical position, in pixels, where the image should be
- rendered onto a raster display -->
+ <!-- The vertical position, in pixels, where the image should be
+ rendered onto a raster display -->
<!ATTLIST "VerticalPixelOffset" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "HorizontalScreenSize" EMPTY>
- <!-- The width, in pixels, of the raster display into which the
- image should be rendered -->
+ <!-- The width, in pixels, of the raster display into which the
+ image should be rendered -->
<!ATTLIST "HorizontalScreenSize" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "VerticalScreenSize" EMPTY>
- <!-- The height, in pixels, of the raster display into which the
- image should be rendered -->
+ <!-- The height, in pixels, of the raster display into which the
+ image should be rendered -->
<!ATTLIST "VerticalScreenSize" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
- <!ELEMENT "Document" (FormatVersion?, SubimageInterpretation?,
+ <!ELEMENT "Document" (FormatVersion?, SubimageInterpretation?,
ImageCreationTime?, ImageModificationTime?)>
- <!-- Document information -->
+ <!-- Document information -->
<!ELEMENT "FormatVersion" EMPTY>
- <!-- The version of the format used by the stream -->
+ <!-- The version of the format used by the stream -->
<!ATTLIST "FormatVersion" "value" #CDATA #REQUIRED>
<!-- Data type: String -->
<!ELEMENT "SubimageInterpretation" EMPTY>
- <!-- The interpretation of this image in relation to the other
- images stored in the same stream -->
- <!ATTLIST "SubimageInterpretation" "value" ("Standalone" |
- "SinglePage" | "FullResolution" | "ReducedResolution" |
- "PyramidLayer" | "Preview" | "VolumeSlice" | "ObjectView" |
- "Panorama" | "AnimationFrame" | "TransparencyMask" |
+ <!-- The interpretation of this image in relation to the other
+ images stored in the same stream -->
+ <!ATTLIST "SubimageInterpretation" "value" ("Standalone" |
+ "SinglePage" | "FullResolution" | "ReducedResolution" |
+ "PyramidLayer" | "Preview" | "VolumeSlice" | "ObjectView" |
+ "Panorama" | "AnimationFrame" | "TransparencyMask" |
"CompositingLayer" | "SpectralSlice" | "Unknown") #REQUIRED>
<!ELEMENT "ImageCreationTime" EMPTY>
- <!-- The time of image creation -->
+ <!-- The time of image creation -->
<!ATTLIST "ImageCreationTime" "year" #CDATA #REQUIRED>
- <!-- The full year (e.g., 1967, not 67) -->
+ <!-- The full year (e.g., 1967, not 67) -->
<!-- Data type: Integer -->
<!ATTLIST "ImageCreationTime" "month" #CDATA #REQUIRED>
- <!-- The month, with January = 1 -->
+ <!-- The month, with January = 1 -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 12 (inclusive) -->
<!ATTLIST "ImageCreationTime" "day" #CDATA #REQUIRED>
- <!-- The day of the month -->
+ <!-- The day of the month -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 31 (inclusive) -->
<!ATTLIST "ImageCreationTime" "hour" #CDATA "0">
- <!-- The hour from 0 to 23 -->
+ <!-- The hour from 0 to 23 -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 23 (inclusive) -->
<!ATTLIST "ImageCreationTime" "minute" #CDATA "0">
- <!-- The minute from 0 to 59 -->
+ <!-- The minute from 0 to 59 -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 59 (inclusive) -->
<!ATTLIST "ImageCreationTime" "second" #CDATA "0">
- <!-- The second from 0 to 60 (60 = leap second) -->
+ <!-- The second from 0 to 60 (60 = leap second) -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 60 (inclusive) -->
<!ELEMENT "ImageModificationTime" EMPTY>
- <!-- The time of the last image modification -->
+ <!-- The time of the last image modification -->
<!ATTLIST "ImageModificationTime" "year" #CDATA #REQUIRED>
- <!-- The full year (e.g., 1967, not 67) -->
+ <!-- The full year (e.g., 1967, not 67) -->
<!-- Data type: Integer -->
<!ATTLIST "ImageModificationTime" "month" #CDATA #REQUIRED>
- <!-- The month, with January = 1 -->
+ <!-- The month, with January = 1 -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 12 (inclusive) -->
<!ATTLIST "ImageModificationTime" "day" #CDATA #REQUIRED>
- <!-- The day of the month -->
+ <!-- The day of the month -->
<!-- Data type: Integer -->
<!-- Min value: 1 (inclusive) -->
<!-- Max value: 31 (inclusive) -->
<!ATTLIST "ImageModificationTime" "hour" #CDATA "0">
- <!-- The hour from 0 to 23 -->
+ <!-- The hour from 0 to 23 -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 23 (inclusive) -->
<!ATTLIST "ImageModificationTime" "minute" #CDATA "0">
- <!-- The minute from 0 to 59 -->
+ <!-- The minute from 0 to 59 -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 59 (inclusive) -->
<!ATTLIST "ImageModificationTime" "second" #CDATA "0">
- <!-- The second from 0 to 60 (60 = leap second) -->
+ <!-- The second from 0 to 60 (60 = leap second) -->
<!-- Data type: Integer -->
<!-- Min value: 0 (inclusive) -->
<!-- Max value: 60 (inclusive) -->
<!ELEMENT "Text" (TextEntry)*>
- <!-- Text information -->
+ <!-- Text information -->
<!ELEMENT "TextEntry" EMPTY>
- <!-- A text entry -->
+ <!-- A text entry -->
<!ATTLIST "TextEntry" "keyword" #CDATA #IMPLIED>
- <!-- A keyword associated with the text entry -->
+ <!-- A keyword associated with the text entry -->
<!-- Data type: String -->
<!ATTLIST "TextEntry" "value" #CDATA #REQUIRED>
- <!-- the text entry -->
+ <!-- the text entry -->
<!-- Data type: String -->
<!ATTLIST "TextEntry" "language" #CDATA #IMPLIED>
- <!-- The language of the text -->
+ <!-- The language of the text -->
<!-- Data type: String -->
<!ATTLIST "TextEntry" "encoding" #CDATA #IMPLIED>
- <!-- The encoding of the text -->
+ <!-- The encoding of the text -->
<!-- Data type: String -->
- <!ATTLIST "TextEntry" "compression" ("none" | "lzw" | "zip" |
+ <!ATTLIST "TextEntry" "compression" ("none" | "lzw" | "zip" |
"bzip" | "other") "none">
- <!-- The method used to compress the text -->
+ <!-- The method used to compress the text -->
- <!ELEMENT "Transparency" (Alpha?, TransparentIndex?,
+ <!ELEMENT "Transparency" (Alpha?, TransparentIndex?,
TransparentColor?, TileTransparencies?, TileOpacities?)>
- <!-- Transparency information -->
+ <!-- Transparency information -->
<!ELEMENT "Alpha" EMPTY>
- <!-- The type of alpha information contained in the image -->
- <!ATTLIST "Alpha" "value" ("none" | "premultiplied" |
+ <!-- The type of alpha information contained in the image -->
+ <!ATTLIST "Alpha" "value" ("none" | "premultiplied" |
"nonpremultiplied") "none">
<!ELEMENT "TransparentIndex" EMPTY>
- <!-- A palette index to be treated as transparent -->
+ <!-- A palette index to be treated as transparent -->
<!ATTLIST "TransparentIndex" "value" #CDATA #REQUIRED>
<!-- Data type: Integer -->
<!ELEMENT "TransparentColor" EMPTY>
- <!-- An RGB color to be treated as transparent -->
+ <!-- An RGB color to be treated as transparent -->
<!ATTLIST "TransparentColor" "value" #CDATA #REQUIRED>
<!-- Data type: List of Integer -->
<!ELEMENT "TileTransparencies" (TransparentTile)*>
- <!-- A list of completely transparent tiles -->
+ <!-- A list of completely transparent tiles -->
<!ELEMENT "TransparentTile" EMPTY>
- <!-- The index of a completely transparent tile -->
+ <!-- The index of a completely transparent tile -->
<!ATTLIST "TransparentTile" "x" #CDATA #REQUIRED>
- <!-- The tile's X index -->
+ <!-- The tile's X index -->
<!-- Data type: Integer -->
<!ATTLIST "TransparentTile" "y" #CDATA #REQUIRED>
- <!-- The tile's Y index -->
+ <!-- The tile's Y index -->
<!-- Data type: Integer -->
<!ELEMENT "TileOpacities" (OpaqueTile)*>
- <!-- A list of completely opaque tiles -->
+ <!-- A list of completely opaque tiles -->
<!ELEMENT "OpaqueTile" EMPTY>
- <!-- The index of a completely opaque tile -->
+ <!-- The index of a completely opaque tile -->
<!ATTLIST "OpaqueTile" "x" #CDATA #REQUIRED>
- <!-- The tile's X index -->
+ <!-- The tile's X index -->
<!-- Data type: Integer -->
<!ATTLIST "OpaqueTile" "y" #CDATA #REQUIRED>
- <!-- The tile's Y index -->
+ <!-- The tile's Y index -->
<!-- Data type: Integer -->
]>
--- old/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html 2017-10-23 13:51:09.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html 2017-10-23 13:51:09.000000000 -0700
@@ -1,8 +1,11 @@
-
-
+
+
+
+ TIFF Metadata Format Specification and Usage Notes
+
-TIFF Metadata Format Specification and Usage Notes
-
+
-
+TIFF Metadata Format Specification and Usage Notes
-
-TIFF Metadata Format Specification and Usage Notes
-
-
-
-Reading Images
-
+Reading Images
-
Writing Images
-
-
Native Stream Metadata Format
Native Image Metadata Format
-
-Reading Images
+
TIFF images are read by an ImageReader
which may be controlled by its public interface as well as via a supplied
@@ -95,14 +79,14 @@
-Color Conversion
+
If the source image data
have photometric type CIE L*a*b* or YCbCr, and the destination color space
type is RGB, then the source image data will be automatically converted to
RGB using an internal color converter.
-Color Spaces
+
The raw color space assigned by default, i.e., in the absence of a
user-supplied ImageTypeSpecifier,
@@ -112,7 +96,7 @@
