third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1029 Spell separator correctly everywhere (not seperator).

Browse Source
This commit is contained in:
Robin Mills
2015-02-14 15:25:52 +00:00
parent 405231439c
commit 856ddd323c
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.h.in
+6 -6
View File
@@ -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 */
include/exiv2/exv_msvc.h
+3 -3
View File
@@ -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
samples/geotag.cpp
+1 -1
View File
@@ -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)
src/actions.cpp
+4 -4
View File
@@ -1916,7 +1916,7 @@ namespace {
<< path << "\n";
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;
}