[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:05 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=90a707f
The following commit has been merged in the master branch:
commit 90a707fa2ee266933c61ef95e52376ca64c80be6
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Apr 10 09:00:47 2005 +0000
Fixed bugs found on MinGW and with MSVC. iotest still misteriously fails.
---
msvc/exiv2lib/exiv2lib.vcproj | 18 ++++++++++++++++++
src/basicio.cpp | 6 ++++++
src/canonmn.cpp | 7 ++++---
src/exif.cpp | 6 ++++++
src/olympusmn.cpp | 2 +-
5 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 4a32f0c..bfdbf0f 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -230,6 +230,21 @@
RelativePath="..\..\src
ikonmn.cpp">
</File>
<File
+ RelativePath="..\..\src\olympusmn.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\src\sigmamn.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -337,6 +352,9 @@
RelativePath="..\..\src
ikonmn.hpp">
</File>
<File
+ RelativePath="..\..\src\olympusmn.hpp">
+ </File>
+ <File
RelativePath="..\..\src
csid.hpp">
</File>
<File
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 078e998..36e1351 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -33,6 +33,12 @@ EXIV2_RCSID("@(#) $Id$");
// *****************************************************************************
// included header files
+#ifdef _MSC_VER
+# include "exv_msvc.h"
+#else
+# include "exv_conf.h"
+#endif
+
#include "basicio.hpp"
#include "types.hpp"
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 6025957..9c4aa60 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -44,6 +44,7 @@ EXIV2_RCSID("@(#) $Id$");
#include <string>
#include <sstream>
#include <iomanip>
+#include <algorithm>
#include <cassert>
#include <cstring>
@@ -346,12 +347,12 @@ namespace Exiv2 {
{
DataBuf buf(1024);
memset(buf.pData_, 0x0, 1024);
- long len = 0;
+ uint16_t len = 0;
Entries::const_iterator end = entries_.end();
for (Entries::const_iterator i = entries_.begin(); i != end; ++i) {
if (i->ifdId() == ifdId) {
- long pos = i->tag() * 2;
- long size = pos + i->size();
+ uint16_t pos = i->tag() * 2;
+ uint16_t size = pos + static_cast<uint16_t>(i->size());
assert(size <= 1024);
memcpy(buf.pData_ + pos, i->data(), i->size());
if (len < size) len = size;
diff --git a/src/exif.cpp b/src/exif.cpp
index 895f07e..f3ddf14 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -35,6 +35,12 @@ EXIV2_RCSID("@(#) $Id$");
// *****************************************************************************
// included header files
+#ifdef _MSC_VER
+# include "exv_msvc.h"
+#else
+# include "exv_conf.h"
+#endif
+
#include "exif.hpp"
#include "types.hpp"
#include "basicio.hpp"
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index cbed20d..0aa6f7e 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -186,7 +186,7 @@ namespace Exiv2 {
OlympusMakerNote::AutoPtr OlympusMakerNote::clone() const
{
- return AutoPtr(clone());
+ return AutoPtr(clone_());
}
OlympusMakerNote* OlympusMakerNote::clone_() const
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list