generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support for multipage decoding in BaseImageDecoder and implemented in TiffDecoder.

Browse Source
This commit is contained in:
Ashod Nakashian 2014-12-29 10:50:03 -05:00
parent 6cb93445e1
commit ecf359b8c9
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgcodecs/src/grfmt_base.hpp
View File

@ -70,6 +70,9 @@ public:
virtual bool readHeader() = 0; virtual bool readHeader() = 0;
virtual bool readData( Mat& img ) = 0; virtual bool readData( Mat& img ) = 0;
/// Called after readData to advance to the next page, if any.
virtual bool nextPage() { return false; }
virtual size_t signatureLength() const; virtual size_t signatureLength() const;
virtual bool checkSignature( const String& signature ) const; virtual bool checkSignature( const String& signature ) const;
virtual ImageDecoder newDecoder() const; virtual ImageDecoder newDecoder() const;

19
modules/imgcodecs/src/grfmt_tiff.cpp
View File

@ -118,10 +118,13 @@ bool TiffDecoder::readHeader()
{ {
bool result = false; bool result = false;
close(); TIFF* tif = static_cast<TIFF*>(m_tif);
// TIFFOpen() mode flags are different to fopen(). A 'b' in mode "rb" has no effect when reading. if (!m_tif)
// http://www.remotesensing.org/libtiff/man/TIFFOpen.3tiff.html {
TIFF* tif = TIFFOpen( m_filename.c_str(), "r" ); // 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
tif = TIFFOpen(m_filename.c_str(), "r");
}
if( tif ) if( tif )
{ {
@ -182,6 +185,13 @@ bool TiffDecoder::readHeader()
return result; return result;
} }
bool TiffDecoder::nextPage()
{
// Prepare the next page, if any.
return m_tif &&
TIFFReadDirectory(static_cast<TIFF*>(m_tif)) &&
readHeader();
}
bool TiffDecoder::readData( Mat& img ) bool TiffDecoder::readData( Mat& img )
{ {
@ -413,7 +423,6 @@ bool TiffDecoder::readData( Mat& img )
} }
} }
close();
return result; return result;
} }

1
modules/imgcodecs/src/grfmt_tiff.hpp
View File

@ -100,6 +100,7 @@ public:
bool readHeader(); bool readHeader();
bool readData( Mat& img ); bool readData( Mat& img );
void close(); void close();
bool nextPage();
size_t signatureLength() const; size_t signatureLength() const;
bool checkSignature( const String& signature ) const; bool checkSignature( const String& signature ) const;