[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:26 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=dd7b63d
The following commit has been merged in the master branch:
commit dd7b63d3ba3015677dc373e2c46333d4933a7f8e
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Jun 10 15:54:55 2004 +0000
Fixed MSVC errors and warnings (Steve, sking_4.patch)
---
src/ifd.cpp | 16 ++++++++--------
src/ifd.hpp | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/ifd.cpp b/src/ifd.cpp
index cad2971..f69bb0a 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
*/
/*
File: ifd.cpp
- Version: $Name: $ $Revision: 1.21 $
+ Version: $Name: $ $Revision: 1.22 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.21 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.22 $ $RCSfile: ifd.cpp,v $")
// *****************************************************************************
// included header files
@@ -77,7 +77,7 @@ namespace Exiv2 {
}
}
- Entry::Entry& Entry::operator=(const Entry& rhs)
+ Entry& Entry::operator=(const Entry& rhs)
{
if (this == &rhs) return *this;
alloc_ = rhs.alloc_;
@@ -378,7 +378,7 @@ namespace Exiv2 {
if (offset != 0) offset_ = offset;
// Add the number of entries to the data buffer
- us2Data(buf, entries_.size(), byteOrder);
+ us2Data(buf, static_cast<uint16>(entries_.size()), byteOrder);
long o = 2;
// Add all directory entries to the data buffer
@@ -472,7 +472,7 @@ namespace Exiv2 {
long Ifd::size() const
{
if (entries_.size() == 0) return 0;
- return 2 + 12 * entries_.size() + 4;
+ return static_cast<long>(2 + 12 * entries_.size() + 4);
}
long Ifd::dataSize() const
@@ -494,7 +494,7 @@ namespace Exiv2 {
<< offset_
<< ", IFD Entries: "
<< std::setfill(' ') << std::dec << std::right
- << entries_.size() << "
"
+ << static_cast<unsigned int>(entries_.size()) << "
"
<< prefix << "Entry Tag Format (Bytes each) Number Offset
"
<< prefix << "----- ------ --------------------- ------ -----------
";
// Print IFD entries
@@ -515,7 +515,7 @@ namespace Exiv2 {
}
}
os << prefix << std::setw(5) << std::setfill(' ') << std::dec
- << std::right << i - b
+ << std::right << static_cast<int>(i - b)
<< " 0x" << std::setw(4) << std::setfill('0') << std::hex
<< std::right << i->tag()
<< " " << std::setw(17) << std::setfill(' ')
@@ -532,7 +532,7 @@ namespace Exiv2 {
// Print data of IFD entries
for (i = b; i != e; ++i) {
if (i->size() > 4) {
- os << "Data of entry " << i - b << ":
";
+ os << "Data of entry " << static_cast<int>(i - b) << ":
";
hexdump(os, i->data(), i->size(), offset_ + i->offset());
}
}
diff --git a/src/ifd.hpp b/src/ifd.hpp
index 6126e97..4a096b0 100644
--- a/src/ifd.hpp
+++ b/src/ifd.hpp
@@ -21,7 +21,7 @@
/*!
@file ifd.hpp
@brief Encoding and decoding of IFD (%Image File Directory) data
- @version $Name: $ $Revision: 1.18 $
+ @version $Name: $ $Revision: 1.19 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 09-Jan-04, ahu: created
@@ -440,7 +440,7 @@ namespace Exiv2 {
//! Get the offset to the next IFD from the start of the TIFF header
uint32 next() const { return next_; }
//! Get the number of directory entries in the IFD
- long count() const { return entries_.size(); }
+ long count() const { return static_cast<long>(entries_.size()); }
//! Get the size of this IFD in bytes (IFD only, without data)
long size() const;
/*!
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list