Merge pull request #24199 from Kumataro:fixlibTiffSite

imgcodecs: fix libtiff URL in opencv source code
pull/24221/head
Alexander Smorkalov 1 year ago committed by GitHub
commit d3bccd7b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      3rdparty/readme.txt
  2. 6
      modules/imgcodecs/src/grfmt_tiff.cpp

@ -39,7 +39,9 @@ libspng Portable Network Graphics library.
libtiff Tag Image File Format (TIFF) Software libtiff Tag Image File Format (TIFF) Software
Copyright (c) 1988-1997 Sam Leffler Copyright (c) 1988-1997 Sam Leffler
Copyright (c) 1991-1997 Silicon Graphics, Inc. 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 for details and links to the source code
WITH_TIFF CMake option must be ON to add libtiff & zlib support to imgcodecs. WITH_TIFF CMake option must be ON to add libtiff & zlib support to imgcodecs.

@ -245,7 +245,7 @@ bool TiffDecoder::readHeader()
if (!tif) if (!tif)
{ {
// TIFFOpen() mode flags are different to fopen(). A 'b' in mode "rb" has no effect when reading. // 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() ) if ( !m_buf.empty() )
{ {
m_buf_pos = 0; m_buf_pos = 0;
@ -1118,7 +1118,7 @@ public:
TIFF* open () TIFF* open ()
{ {
// do NOT put "wb" as the mode, because the b means "big endian" mode, not "binary" mode. // 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, return TIFFClientOpen( "", "w", reinterpret_cast<thandle_t>(this), &TiffEncoderBufHelper::read,
&TiffEncoderBufHelper::write, &TiffEncoderBufHelper::seek, &TiffEncoderBufHelper::write, &TiffEncoderBufHelper::seek,
&TiffEncoderBufHelper::close, &TiffEncoderBufHelper::size, &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) 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. // 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; TIFF* tif = NULL;
TiffEncoderBufHelper buf_helper(m_buf); TiffEncoderBufHelper buf_helper(m_buf);

Loading…
Cancel
Save