From 0abb87a488e99cdbc418e14411a6bbf7a3f28079 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Wed, 11 Jan 2023 07:42:42 +0000
Subject: [PATCH] 8299227: host `exif.org` not found in link in doc comment

Reviewed-by: prr, serb
---
 .../sun/imageio/plugins/tiff/TIFFImageWriteParam.java    | 7 ++++---
 .../javax/imageio/metadata/doc-files/tiff_metadata.html  | 9 +++++----
 src/java.desktop/share/native/libjavajpeg/imageioJPEG.c  | 8 +++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java
index a012ac990fd..5005f096bab 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,8 +78,9 @@ import javax.imageio.ImageWriteParam;
  * <tr>
  * <td>Exif JPEG</td>
  * <td>Exif-specific JPEG compression (see note following this table)</td>
- * <td><a href="http://www.exif.org/Exif2-2.PDF">Exif 2.2 Specification</a>
- * (PDF), section 4.5.5, "Basic Structure of Thumbnail Data"</td>
+ * <td><a href="https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf">
+ * Exif 2.3 Specification</a>
+ * (PDF), section 4.5.8, "Basic Structure of Thumbnail Data"</td>
  * </table>
  *
  * <p>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
index 9bc70cd96d4..ee6b4a8fe10 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
@@ -5,7 +5,7 @@
     <title>TIFF Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -574,8 +574,9 @@ DEFLATE Compressed Data Format Specification</a></td>
 <th scope="row">9</th>
 <td>Exif JPEG</td>
 <td>Exif-specific JPEG compression (see note following this table)</td>
-<td><a href="http://www.exif.org/Exif2-2.PDF">Exif 2.2 Specification</a>
-(PDF), section 4.5.5, "Basic Structure of Thumbnail Data"</td>
+<td><a href="https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf">
+    Exif 2.3 Specification</a>
+(PDF), section 4.5.8, "Basic Structure of Thumbnail Data"</td>
 </tbody>
 </table>
 
@@ -739,7 +740,7 @@ color space is grayscale.</li>
 be written as supplied.</p>
 
 <p>If an Exif image is being written, the set of fields present and their
-values will be modified such that the result is in accord with the Exif 2.2
+values will be modified such that the result is in accord with the Exif 2.3
 specification.</p>
 
 <p>Setting up the image metadata to write to a TIFF stream may be simplified
diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
index 4ebd565fe35..6b1b9e4f99b 100644
--- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1614,7 +1614,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setSource
 /*
  * For EXIF images, the APP1 will appear immediately after the SOI,
  * so it's safe to only look at the first marker in the list.
- * (see http://www.exif.org/Exif2-2.PDF, section 4.7, page 58)
+ * (see https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf,
+ * section 4.7, page 83)
  */
 #define IS_EXIF(c) \
     (((c)->marker_list != NULL) && ((c)->marker_list->marker == JPEG_APP1))
@@ -1715,7 +1716,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader
              *  - we got JFIF image
              *     Must be YCbCr (see http://www.w3.org/Graphics/JPEG/jfif3.pdf, page 2)
              *  - we got EXIF image
-             *     Must be YCbCr (see http://www.exif.org/Exif2-2.PDF, section 4.7, page 63)
+             *     Must be YCbCr (see https://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf,
+             *     section 4.7, page 88)
              *  - something else
              *     Apply heuristical rules to identify actual colorspace.
              */