[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:43 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c088f6b
The following commit has been merged in the master branch:
commit c088f6bc3e37110e871439350806745cfd682764
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Aug 17 02:51:13 2008 +0000
Renamed makernote2 files and TiffHeade2 class.
---
src/Makefile | 2 +-
src/{makernote2.cpp => makernote.cpp} | 8 ++++----
src/{makernote2_int.hpp => makernote_int.hpp} | 8 ++++----
src/tiffcomposite.cpp | 2 +-
src/tiffimage.cpp | 16 ++++++++--------
src/tiffimage_int.hpp | 10 +++++-----
src/tiffparse.cpp | 2 +-
src/tiffvisitor.cpp | 2 +-
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 42d0f14..a6913d4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -82,7 +82,7 @@ CCSRC = basicio.cpp \
iptc.cpp \
jp2image.cpp \
jpgimage.cpp \
- makernote2.cpp \
+ makernote.cpp \
metadatum.cpp \
minoltamn.cpp \
mrwimage.cpp \
diff --git a/src/makernote2.cpp b/src/makernote.cpp
similarity index 99%
rename from src/makernote2.cpp
rename to src/makernote.cpp
index 5df6278..64b650f 100644
--- a/src/makernote2.cpp
+++ b/src/makernote.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*
- File: makernote2.cpp
+ File: makernote.cpp
Version: $Rev$
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 11-Apr-06, ahu: created
@@ -36,7 +36,7 @@ EXIV2_RCSID("@(#) $Id$")
# include "exv_conf.h"
#endif
-#include "makernote2_int.hpp"
+#include "makernote_int.hpp"
#include "tiffcomposite_int.hpp"
#include "tiffvisitor_int.hpp"
#include "tiffimage.hpp"
@@ -367,7 +367,7 @@ namespace Exiv2 {
if (0 != memcmp(pData, signature_, 6)) return false;
buf_.alloc(size_);
std::memcpy(buf_.pData_, pData, buf_.size_);
- TiffHeade2 th;
+ TiffHeader th;
if (!th.read(buf_.pData_ + 10, 8)) return false;
byteOrder_ = th.byteOrder();
start_ = 10 + th.offset();
@@ -583,7 +583,7 @@ namespace Exiv2 {
}
// If the "Nikon" string is not followed by a TIFF header, we assume
// Nikon2 format
- TiffHeade2 tiffHeader;
+ TiffHeader tiffHeader;
if ( size < 18
|| !tiffHeader.read(pData + 10, size - 10)
|| tiffHeader.tag() != 0x002a) {
diff --git a/src/makernote2_int.hpp b/src/makernote_int.hpp
similarity index 99%
rename from src/makernote2_int.hpp
rename to src/makernote_int.hpp
index 720c03d..4f65c41 100644
--- a/src/makernote2_int.hpp
+++ b/src/makernote_int.hpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*!
- @file makernote2_int.hpp
+ @file makernote_int.hpp
@brief Internal Makernote TIFF composite class TiffIfdMakernote and classes
for various makernote headers.
@version $Rev$
@@ -27,8 +27,8 @@
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 11-Apr-06, ahu: created
*/
-#ifndef MAKERNOTE2_INT_HPP_
-#define MAKERNOTE2_INT_HPP_
+#ifndef MAKERNOTE_INT_HPP_
+#define MAKERNOTE_INT_HPP_
// *****************************************************************************
// included header files
@@ -699,4 +699,4 @@ namespace Exiv2 {
}} // namespace Internal, Exiv2
-#endif // #ifndef MAKERNOTE2_INT_HPP_
+#endif // #ifndef MAKERNOTE_INT_HPP_
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 0d41a8b..587f525 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -38,7 +38,7 @@ EXIV2_RCSID("@(#) $Id$")
#include "tiffcomposite_int.hpp"
#include "tiffvisitor_int.hpp"
-#include "makernote2_int.hpp"
+#include "makernote_int.hpp"
#include "value.hpp"
#include "error.hpp"
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index fb3b231..f280ac7 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -41,7 +41,7 @@ EXIV2_RCSID("@(#) $Id$")
#include "tiffimage_int.hpp"
#include "tiffcomposite_int.hpp"
#include "tiffvisitor_int.hpp"
-#include "makernote2_int.hpp"
+#include "makernote_int.hpp"
#include "image.hpp"
#include "error.hpp"
#include "futils.hpp"
@@ -79,7 +79,7 @@ EXIV2_RCSID("@(#) $Id$")
in crwimage.* :
- + Fix CiffHeader according to TiffHeade2
+ + Fix CiffHeader according to TiffHeader
+ Combine Error(15) and Error(33), add format argument %1
+ Search crwimage for todos, fix writeMetadata comment
+ rename loadStack to getPath for consistency
@@ -162,7 +162,7 @@ namespace Exiv2 {
if (io_->error() || io_->eof()) {
buf.reset();
}
- TiffHeade2 tiffHeader;
+ TiffHeader tiffHeader;
if (0 == tiffHeader.read(buf.pData_, 8)) {
bo = tiffHeader.byteOrder();
}
@@ -223,7 +223,7 @@ namespace Exiv2 {
const XmpData& xmpData
)
{
- std::auto_ptr<TiffHeaderBase> header(new TiffHeade2(byteOrder));
+ std::auto_ptr<TiffHeaderBase> header(new TiffHeader(byteOrder));
return TiffParserWorker::encode(blob,
pData,
size,
@@ -254,7 +254,7 @@ namespace Exiv2 {
if (iIo.error() || iIo.eof()) {
return false;
}
- TiffHeade2 tiffHeader;
+ TiffHeader tiffHeader;
bool rc = tiffHeader.read(buf, len);
if (!advance || !rc) {
iIo.seek(-len, BasicIo::cur);
@@ -532,7 +532,7 @@ namespace Exiv2 {
// Create standard TIFF header if necessary
std::auto_ptr<TiffHeaderBase> ph;
if (!pHeader) {
- ph = std::auto_ptr<TiffHeaderBase>(new TiffHeade2);
+ ph = std::auto_ptr<TiffHeaderBase>(new TiffHeader);
pHeader = ph.get();
}
TiffComponent::AutoPtr rootDir = parse(pData, size, createFct, pHeader);
@@ -736,12 +736,12 @@ namespace Exiv2 {
return tag_;
}
- TiffHeade2::TiffHeade2(ByteOrder byteOrder)
+ TiffHeader::TiffHeader(ByteOrder byteOrder)
: TiffHeaderBase(42, 8, byteOrder, 0x00000008)
{
}
- TiffHeade2::~TiffHeade2()
+ TiffHeader::~TiffHeader()
{
}
diff --git a/src/tiffimage_int.hpp b/src/tiffimage_int.hpp
index 4359b0f..1e19292 100644
--- a/src/tiffimage_int.hpp
+++ b/src/tiffimage_int.hpp
@@ -125,16 +125,16 @@ namespace Exiv2 {
/*!
@brief Standard TIFF header structure.
*/
- class TiffHeade2 : public TiffHeaderBase {
+ class TiffHeader : public TiffHeaderBase {
public:
//! @name Creators
//@{
//! Default constructor
- TiffHeade2(ByteOrder byteOrder =littleEndian);
+ TiffHeader(ByteOrder byteOrder =littleEndian);
//! Destructor
- ~TiffHeade2();
+ ~TiffHeader();
//@}
- }; // class TiffHeade2
+ }; // class TiffHeader
/*!
@brief TIFF component factory for standard TIFF components.
@@ -172,7 +172,7 @@ namespace Exiv2 {
\em size into the provided metadata containers.
This is the entry point to access image data in TIFF format. The
- parser uses classes TiffHeade2 and the TiffComponent and TiffVisitor
+ parser uses classes TiffHeader and the TiffComponent and TiffVisitor
hierarchies.
@param exifData Exif metadata container.
diff --git a/src/tiffparse.cpp b/src/tiffparse.cpp
index 16b3d1a..31f0d5b 100644
--- a/src/tiffparse.cpp
+++ b/src/tiffparse.cpp
@@ -38,7 +38,7 @@ try {
io.read(buf.pData_, len);
if (io.error() || io.eof()) throw Error(14);
- TiffHeade2 tiffHeader;
+ TiffHeader tiffHeader;
if (!tiffHeader.read(buf.pData_, buf.size_)) throw Error(3, "TIFF");
TiffCompFactoryFct createFct = TiffCreator::create;
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 6113f1a..d889969 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -39,7 +39,7 @@ EXIV2_RCSID("@(#) $Id$")
#include "tiffcomposite_int.hpp" // Do not change the order of these 2 includes,
#include "tiffvisitor_int.hpp" // see bug #487
#include "tiffimage_int.hpp"
-#include "makernote2_int.hpp"
+#include "makernote_int.hpp"
#include "exif.hpp"
#include "iptc.hpp"
#include "value.hpp"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list