Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.
/ jdk20 Public archive

Commit 0abb87a

Browse files
Abhishek KumarTejesh R
Abhishek Kumar
authored and
Tejesh R
committed
8299227: host exif.org not found in link in doc comment
Reviewed-by: prr, serb
1 parent de79162 commit 0abb87a

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -78,8 +78,9 @@
7878
* <tr>
7979
* <td>Exif JPEG</td>
8080
* <td>Exif-specific JPEG compression (see note following this table)</td>
81-
* <td><a href="http://www.exif.org/Exif2-2.PDF">Exif 2.2 Specification</a>
82-
* (PDF), section 4.5.5, "Basic Structure of Thumbnail Data"</td>
81+
* <td><a href="https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf">
82+
* Exif 2.3 Specification</a>
83+
* (PDF), section 4.5.8, "Basic Structure of Thumbnail Data"</td>
8384
* </table>
8485
*
8586
* <p>

src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>TIFF Metadata Format Specification and Usage Notes</title>
66
</head>
77
<!--
8-
Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
8+
Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
99
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1010
1111
This code is free software; you can redistribute it and/or modify it
@@ -574,8 +574,9 @@ <h3><a id="Compression">Compression</a></h3>
574574
<th scope="row">9</th>
575575
<td>Exif JPEG</td>
576576
<td>Exif-specific JPEG compression (see note following this table)</td>
577-
<td><a href="http://www.exif.org/Exif2-2.PDF">Exif 2.2 Specification</a>
578-
(PDF), section 4.5.5, "Basic Structure of Thumbnail Data"</td>
577+
<td><a href="https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf">
578+
Exif 2.3 Specification</a>
579+
(PDF), section 4.5.8, "Basic Structure of Thumbnail Data"</td>
579580
</tbody>
580581
</table>
581582

@@ -739,7 +740,7 @@ <h3><a id="MetadataIssuesWrite">Metadata Issues</a></h3>
739740
be written as supplied.</p>
740741

741742
<p>If an Exif image is being written, the set of fields present and their
742-
values will be modified such that the result is in accord with the Exif 2.2
743+
values will be modified such that the result is in accord with the Exif 2.3
743744
specification.</p>
744745

745746
<p>Setting up the image metadata to write to a TIFF stream may be simplified

src/java.desktop/share/native/libjavajpeg/imageioJPEG.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1614,7 +1614,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setSource
16141614
/*
16151615
* For EXIF images, the APP1 will appear immediately after the SOI,
16161616
* so it's safe to only look at the first marker in the list.
1617-
* (see http://www.exif.org/Exif2-2.PDF, section 4.7, page 58)
1617+
* (see https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf,
1618+
* section 4.7, page 83)
16181619
*/
16191620
#define IS_EXIF(c) \
16201621
(((c)->marker_list != NULL) && ((c)->marker_list->marker == JPEG_APP1))
@@ -1715,7 +1716,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader
17151716
* - we got JFIF image
17161717
* Must be YCbCr (see http://www.w3.org/Graphics/JPEG/jfif3.pdf, page 2)
17171718
* - we got EXIF image
1718-
* Must be YCbCr (see http://www.exif.org/Exif2-2.PDF, section 4.7, page 63)
1719+
* Must be YCbCr (see https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf,
1720+
* section 4.7, page 88)
17191721
* - something else
17201722
* Apply heuristical rules to identify actual colorspace.
17211723
*/

0 commit comments

Comments
 (0)