[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=856ddd3

The following commit has been merged in the master branch:
commit 856ddd323c5536360df9e1d9b7b4f1de100f38ee
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Feb 14 15:25:52 2015 +0000

    #1029  Spell separator correctly everywhere (not seperator).
---
 config/config.h.in       | 12 ++++++------
 include/exiv2/exv_msvc.h |  6 +++---
 samples/geotag.cpp       |  2 +-
 src/actions.cpp          |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index af05d4f..e33ede4 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -205,14 +205,14 @@
       we can rely on checking just for that macro. */
 #define __CYGWIN__  __CYGWIN32__
 #endif
-     
-/* File path seperator */
+
+/* File path separator */
 #if defined WIN32 && !defined __CYGWIN__
-#define SEPERATOR_STR "\"
-#define SEPERATOR_CHR '\'
+#define SEPARATOR_STR "\"
+#define SEPARATOR_CHR '\'
 #else
-#define SEPERATOR_STR "/"
-#define SEPERATOR_CHR '/'
+#define SEPARATOR_STR "/"
+#define SEPARATOR_CHR '/'
 #endif
 
 /* Windows unicode path support */
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 39a14cd..a7419c5 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -111,9 +111,9 @@ typedef int pid_t;
 #pragma comment(lib, "ws2_32.lib")
 #pragma comment(lib, "wldap32.lib")
 
-/* File path seperator */
-#define EXV_SEPERATOR_STR "\"
-#define EXV_SEPERATOR_CHR '\'
+/* File path separator */
+#define EXV_SEPARATOR_STR "\"
+#define EXV_SEPARATOR_CHR '\'
 
 /* Windows unicode path support */
 // #define EXV_UNICODE_PATH
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index 71e6b5c..c5ec197 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -451,7 +451,7 @@ string getExifTime(const time_t t)
 
 std::string makePath(std::string dir,std::string file)
 {
-    return dir + std::string(EXV_SEPERATOR_STR) + file ;
+    return dir + std::string(EXV_SEPARATOR_STR) + file ;
 }
 
 const char* makePath(const char* dir,const char* file)
diff --git a/src/actions.cpp b/src/actions.cpp
index d38d0b8..95ed65e 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1916,7 +1916,7 @@ namespace {
                       << path << "
";
             return 1;
         }
-        newPath =   Util::dirname(path) + EXV_SEPERATOR_STR
+        newPath =   Util::dirname(path) + EXV_SEPARATOR_STR
                   + basename + Util::suffix(path);
         if (   Util::dirname(newPath)  == Util::dirname(path)
             && Util::basename(newPath) == Util::basename(path)) {
@@ -1939,7 +1939,7 @@ namespace {
                     break;
                 case Params::renamePolicy:
                     newPath = Util::dirname(path)
-                        + EXV_SEPERATOR_STR + basename
+                        + EXV_SEPARATOR_STR + basename
                         + "_" + Exiv2::toString(seq++)
                         + Util::suffix(path);
                     break;
@@ -1958,7 +1958,7 @@ namespace {
                     case 'R':
                         fileExistsPolicy = Params::renamePolicy;
                         newPath = Util::dirname(path)
-                            + EXV_SEPERATOR_STR + basename
+                            + EXV_SEPARATOR_STR + basename
                             + "_" + Exiv2::toString(seq++)
                             + Util::suffix(path);
                         break;
@@ -1998,7 +1998,7 @@ namespace {
     {
         std::string directory = Params::instance().directory_;
         if (directory.empty()) directory = Util::dirname(path);
-        std::string newPath =   directory + EXV_SEPERATOR_STR
+        std::string newPath =   directory + EXV_SEPARATOR_STR
                               + Util::basename(path, true) + ext;
         return newPath;
     }

-- 
exiv2 packaging