Merge pull request #24199 from Kumataro:fixlibTiffSite

asmorkalov · web-flow · commit d3bccd7b23e4 · 2023-09-04T10:54:43.000+03:00
imgcodecs: fix libtiff URL in opencv source code
diff --git a/3rdparty/readme.txt b/3rdparty/readme.txt
@@ -39,7 +39,9 @@ libspng               Portable Network Graphics library.
 libtiff               Tag Image File Format (TIFF) Software
                       Copyright (c) 1988-1997 Sam Leffler
                       Copyright (c) 1991-1997 Silicon Graphics, Inc.
-                      See libtiff home page http://www.libtiff.org/
+                      See libtiff home page #1 http://www.simplesystems.org/libtiff/
+                                            #2 https://libtiff.gitlab.io/libtiff/
+                                            #3 http://libtiff.maptools.org/
                       for details and links to the source code
 
                       WITH_TIFF CMake option must be ON to add libtiff & zlib support to imgcodecs.
diff --git a/modules/imgcodecs/src/grfmt_tiff.cpp b/modules/imgcodecs/src/grfmt_tiff.cpp
@@ -245,7 +245,7 @@ bool TiffDecoder::readHeader()
     if (!tif)
     {
         // TIFFOpen() mode flags are different to fopen().  A 'b' in mode "rb" has no effect when reading.
-        // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html
+        // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html
         if ( !m_buf.empty() )
         {
             m_buf_pos = 0;
@@ -1118,7 +1118,7 @@ class TiffEncoderBufHelper
     TIFF* open ()
     {
         // do NOT put "wb" as the mode, because the b means "big endian" mode, not "binary" mode.
-        // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html
+        // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html
         return TIFFClientOpen( "", "w", reinterpret_cast<thandle_t>(this), &TiffEncoderBufHelper::read,
                                &TiffEncoderBufHelper::write, &TiffEncoderBufHelper::seek,
                                &TiffEncoderBufHelper::close, &TiffEncoderBufHelper::size,
@@ -1200,7 +1200,7 @@ static bool readParam(const std::vector<int>& params, int key, int& value)
 bool TiffEncoder::writeLibTiff( const std::vector<Mat>& img_vec, const std::vector<int>& params)
 {
     // do NOT put "wb" as the mode, because the b means "big endian" mode, not "binary" mode.
-    // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html
+    // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html
     TIFF* tif = NULL;
 
     TiffEncoderBufHelper buf_helper(m_buf);

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ bool TiffDecoder::readHeader()`
`245`	`245`	`if (!tif)`
`246`	`246`	`{`
`247`	`247`	`// TIFFOpen() mode flags are different to fopen(). A 'b' in mode "rb" has no effect when reading.`
`248`		`- // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html`
	`248`	`+ // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html`
`249`	`249`	`if ( !m_buf.empty() )`
`250`	`250`	`{`
`251`	`251`	`m_buf_pos = 0;`
`@@ -1118,7 +1118,7 @@ class TiffEncoderBufHelper`
`1118`	`1118`	`TIFF* open ()`
`1119`	`1119`	`{`
`1120`	`1120`	`// do NOT put "wb" as the mode, because the b means "big endian" mode, not "binary" mode.`
`1121`		`- // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html`
	`1121`	`+ // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html`
`1122`	`1122`	`return TIFFClientOpen( "", "w", reinterpret_cast<thandle_t>(this), &TiffEncoderBufHelper::read,`
`1123`	`1123`	`&TiffEncoderBufHelper::write, &TiffEncoderBufHelper::seek,`
`1124`	`1124`	`&TiffEncoderBufHelper::close, &TiffEncoderBufHelper::size,`
`@@ -1200,7 +1200,7 @@ static bool readParam(const std::vector<int>& params, int key, int& value)`
`1200`	`1200`	`bool TiffEncoder::writeLibTiff( const std::vector<Mat>& img_vec, const std::vector<int>& params)`
`1201`	`1201`	`{`
`1202`	`1202`	`// do NOT put "wb" as the mode, because the b means "big endian" mode, not "binary" mode.`
`1203`		`- // http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html`
	`1203`	`+ // http://www.simplesystems.org/libtiff/functions/TIFFOpen.html`
`1204`	`1204`	`TIFF* tif = NULL;`
`1205`	`1205`
`1206`	`1206`	`TiffEncoderBufHelper buf_helper(m_buf);`