[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:27 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b69c40e
The following commit has been merged in the master branch:
commit b69c40e671725287cd5e62e0a8296cdb3a1c12b2
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Jun 19 11:22:17 2004 +0000
Fixed MSVC errors and warnings (Steve, sking_5.patch)
---
src/exif.hpp | 4 ++--
src/exiv2.cpp | 6 +++---
src/ifd.cpp | 6 +++---
src/types.hpp | 5 +++--
src/utils.cpp | 11 ++++++++---
src/write-test.cpp | 4 +++-
6 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/exif.hpp b/src/exif.hpp
index ce1b7b2..f564bb8 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
/*!
@file exif.hpp
@brief Encoding and decoding of Exif data
- @version $Name: $ $Revision: 1.45 $
+ @version $Name: $ $Revision: 1.46 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 09-Jan-04, ahu: created
@@ -691,7 +691,7 @@ namespace Exiv2 {
*/
const_iterator findIfdIdIdx(IfdId ifdId, int idx) const;
//! Get the number of metadata entries
- long count() const { return metadata_.size(); }
+ long count() const { return static_cast<long>(metadata_.size()); }
/*!
@brief Return the approximate size of all Exif data (TIFF header plus
metadata). The number returned may be bigger than the actual
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index dcbef7d..e9f0739 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -22,13 +22,13 @@
Abstract: Command line program to display and manipulate image %Exif data
File: exiv2.cpp
- Version: $Name: $ $Revision: 1.8 $
+ Version: $Name: $ $Revision: 1.9 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 10-Dec-03, ahu: created
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.8 $ $RCSfile: exiv2.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.9 $ $RCSfile: exiv2.cpp,v $")
// *****************************************************************************
// included header files
@@ -78,7 +78,7 @@ int main(int argc, char* const argv[])
// Process all files
int n = 1;
- int s = params.files_.size();
+ int s = static_cast<int>(params.files_.size());
int w = s > 9 ? s > 99 ? 3 : 2 : 1;
Params::Files::const_iterator e = params.files_.end();
for (Params::Files::const_iterator i = params.files_.begin(); i != e; ++i) {
diff --git a/src/ifd.cpp b/src/ifd.cpp
index f69bb0a..244aa5b 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
*/
/*
File: ifd.cpp
- Version: $Name: $ $Revision: 1.22 $
+ Version: $Name: $ $Revision: 1.23 $
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.22 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.23 $ $RCSfile: ifd.cpp,v $")
// *****************************************************************************
// included header files
@@ -300,7 +300,7 @@ namespace Exiv2 {
// Todo: How to handle debug output like this
std::cerr << "Warning: Upper boundary of data for "
<< ExifTags::ifdName(ifdId_)
- << " entry " << i - begin
+ << " entry " << static_cast<int>(i - begin)
<< " is out of bounds:
"
<< " Offset = " << tmpOffset
<< ", size = " << i->size_
diff --git a/src/types.hpp b/src/types.hpp
index 5461165..7e4df2f 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -21,7 +21,7 @@
/*!
@file types.hpp
@brief Type definitions for %Exiv2 and related functionality
- @version $Name: $ $Revision: 1.14 $
+ @version $Name: $ $Revision: 1.15 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 09-Jan-04, ahu: created
@@ -43,7 +43,8 @@
#ifdef _MSC_VER
// disable unreferenced formal parameter warning C4100
// disable truncation of constant value warning C4309
-#pragma warning (disable: 4100 4309)
+// disable warning conversion of int to bool C4800
+#pragma warning (disable: 4100 4309 4800)
#endif
// *****************************************************************************
diff --git a/src/utils.cpp b/src/utils.cpp
index 43c9a2e..619ee2f 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -20,13 +20,13 @@
*/
/*
File: utils.cpp
- Version: $Name: $ $Revision: 1.5 $
+ Version: $Name: $ $Revision: 1.6 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 08-Dec-03, ahu: created
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.5 $ $RCSfile: utils.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.6 $ $RCSfile: utils.cpp,v $")
// *****************************************************************************
// included header files
@@ -35,7 +35,12 @@ EXIV2_RCSID("@(#) $Name: $ $Revision: 1.5 $ $RCSfile: utils.cpp,v $")
// + standard includes
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef _MSC_VER
+#include "getopt.h"
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#else
#include <unistd.h> // for getopt(), stat()
+#endif
#include <errno.h>
#include <cstdlib>
@@ -52,7 +57,7 @@ int Getopt::getopt(int argc, char* const argv[], const std::string& optstring)
{
progname_ = Util::basename(argv[0]);
- while (true) {
+ for (;;) {
int c = ::getopt(argc, argv, optstring.c_str());
if (c == -1) break;
errcnt_ += option(c, ::optarg == 0 ? "" : ::optarg, ::optopt);
diff --git a/src/write-test.cpp b/src/write-test.cpp
index 05ceeba..6ca0246 100644
--- a/src/write-test.cpp
+++ b/src/write-test.cpp
@@ -3,7 +3,7 @@
Abstract : ExifData write unit tests
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
- Version : $Name: $ $Revision: 1.5 $
+ Version : $Name: $ $Revision: 1.6 $
Test procedure:
$ rm -f test.jpg thumb.jpg iii ttt;
@@ -39,6 +39,7 @@ void exifPrint(const ExifData& exifData);
// *****************************************************************************
// Main
int main(int argc, char* const argv[])
+{
try {
if (argc != 3) {
@@ -109,6 +110,7 @@ catch (Error& e) {
std::cerr << "Caught Exif exception '" << e << "'
";
return 1;
}
+}
// *****************************************************************************
void testCase(const std::string& file1,
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list