[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:30 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=36e09c9
The following commit has been merged in the master branch:
commit 36e09c9e402b28f6f923f9dc5c45fc0318398585
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Apr 24 08:22:25 2006 +0000
Combined Makernote header read and check functionality to simplify things
---
src/fujimn2.cpp | 12 +-----------
src/fujimn2.hpp | 2 --
src/makernote2.cpp | 5 -----
src/makernote2.hpp | 13 +------------
src/olympusmn2.cpp | 12 +-----------
src/olympusmn2.hpp | 2 --
src/tiffvisitor.cpp | 9 ++++-----
7 files changed, 7 insertions(+), 48 deletions(-)
diff --git a/src/fujimn2.cpp b/src/fujimn2.cpp
index 607dfe7..02055e2 100644
--- a/src/fujimn2.cpp
+++ b/src/fujimn2.cpp
@@ -77,17 +77,12 @@ namespace Exiv2 {
// from the header. Note that we ignore the byteOrder argument
start_ = getUShort(header_.pData_ + 8, byteOrder_);
- return true;
- } // FujiMnHeader::read
-
- bool FujiMnHeader::check() const
- {
if ( static_cast<uint32_t>(header_.size_) < size_
|| 0 != memcmp(header_.pData_, signature_, 8)) {
return false;
}
return true;
- } // FujiMnHeader::check
+ } // FujiMnHeader::read
bool TiffFujiMn::doReadHeader(const byte* pData,
uint32_t size,
@@ -96,11 +91,6 @@ namespace Exiv2 {
return header_.read(pData, size, byteOrder);
}
- bool TiffFujiMn::doCheckHeader() const
- {
- return header_.check();
- }
-
uint32_t TiffFujiMn::doIfdOffset() const
{
return header_.ifdOffset();
diff --git a/src/fujimn2.hpp b/src/fujimn2.hpp
index 0a7741e..1d83ca8 100644
--- a/src/fujimn2.hpp
+++ b/src/fujimn2.hpp
@@ -68,7 +68,6 @@ namespace Exiv2 {
//@{
virtual uint32_t size() const { return header_.size_; }
virtual uint32_t ifdOffset() const { return start_; }
- virtual bool check() const;
//! Return the byte order for the header
ByteOrder byteOrder() const { return byteOrder_; }
//@}
@@ -106,7 +105,6 @@ namespace Exiv2 {
//! @name Accessors
//@{
- virtual bool doCheckHeader() const;
virtual uint32_t doIfdOffset() const;
virtual TiffRwState::AutoPtr doGetState(uint32_t mnOffset,
ByteOrder byteOrder) const;
diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index 40297e7..2eca3be 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -68,11 +68,6 @@ namespace Exiv2 {
return doReadHeader(pData, size, byteOrder);
}
- bool TiffIfdMakernote::checkHeader() const
- {
- return doCheckHeader();
- }
-
uint32_t TiffIfdMakernote::ifdOffset() const
{
return doIfdOffset();
diff --git a/src/makernote2.hpp b/src/makernote2.hpp
index dd9fc81..578fc64 100644
--- a/src/makernote2.hpp
+++ b/src/makernote2.hpp
@@ -116,7 +116,7 @@ namespace Exiv2 {
//@}
//! @name Manipulators
//@{
- //! Read the header from a data buffer, return true if successful
+ //! Read the header from a data buffer, return true if ok
virtual bool read(const byte* pData,
uint32_t size,
ByteOrder byteOrder) =0;
@@ -130,8 +130,6 @@ namespace Exiv2 {
header.
*/
virtual uint32_t ifdOffset() const =0;
- //! Check the header, return true if ok
- virtual bool check() const =0;
//@}
}; // class MnHeader
@@ -161,8 +159,6 @@ namespace Exiv2 {
//! @name Accessors
//@{
- //! Check the header, return true if ok
- bool checkHeader() const;
/*!
@brief Return the offset to the start of the Makernote IFD from
the start of the Makernote.
@@ -205,13 +201,6 @@ namespace Exiv2 {
//! @name Accessors
//@{
/*!
- @brief Implements checkHeader().
-
- Default implementation simply returns true. Derived classes for
- makernotes which have a header should overwrite this.
- */
- virtual bool doCheckHeader() const { return true; }
- /*!
@brief Implements ifdOffset().
Default implementation returns 0. Derived classes for makernotes
diff --git a/src/olympusmn2.cpp b/src/olympusmn2.cpp
index 92a327c..6998e98 100644
--- a/src/olympusmn2.cpp
+++ b/src/olympusmn2.cpp
@@ -70,17 +70,12 @@ namespace Exiv2 {
header_.alloc(size_);
memcpy(header_.pData_, pData, header_.size_);
- return true;
- } // OlympusMnHeader::read
-
- bool OlympusMnHeader::check() const
- {
if ( static_cast<uint32_t>(header_.size_) < size_
|| 0 != memcmp(header_.pData_, signature_, 5)) {
return false;
}
return true;
- } // OlympusMnHeader::check
+ } // OlympusMnHeader::read
bool TiffOlympusMn::doReadHeader(const byte* pData,
uint32_t size,
@@ -89,11 +84,6 @@ namespace Exiv2 {
return header_.read(pData, size, byteOrder);
}
- bool TiffOlympusMn::doCheckHeader() const
- {
- return header_.check();
- }
-
uint32_t TiffOlympusMn::doIfdOffset() const
{
return header_.ifdOffset();
diff --git a/src/olympusmn2.hpp b/src/olympusmn2.hpp
index b37f0cb..d2de754 100644
--- a/src/olympusmn2.hpp
+++ b/src/olympusmn2.hpp
@@ -68,7 +68,6 @@ namespace Exiv2 {
//@{
virtual uint32_t size() const { return header_.size_; }
virtual uint32_t ifdOffset() const { return size_; }
- virtual bool check() const;
//@}
private:
@@ -102,7 +101,6 @@ namespace Exiv2 {
//! @name Accessors
//@{
- virtual bool doCheckHeader() const;
virtual uint32_t doIfdOffset() const;
//@}
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 2648ed0..a2f2379 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -562,12 +562,11 @@ namespace Exiv2 {
{
assert(object != 0);
- object->readHeader(object->start(),
- static_cast<uint32_t>(pLast_ - object->start()),
- byteOrder());
- if (!object->checkHeader()) {
+ if (!object->readHeader(object->start(),
+ static_cast<uint32_t>(pLast_ - object->start()),
+ byteOrder())) {
#ifndef SUPPRESS_WARNINGS
- std::cerr << "Error: IFD Makernote header check failed.
";
+ std::cerr << "Error: Failed to read IFD Makernote header.
";
#endif
return; // todo: signal error to parent, delete object
}
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list