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

#1169 Fix submitted.

Browse Source
This commit is contained in:
Robin Mills
2016-04-21 11:26:29 +00:00
parent 00984afaa2
commit 30f279787f
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/exiv2/exv_msvc.h
+3 -2
View File
@@ -85,6 +85,7 @@
/* Define Windows unicode path support. */
/* #undef EXV_UNICODE_PATH */
#define EXV_UNICODE_PATH 1
/* Define to `const' or to empty, depending on the second argument of `iconv'. */
@@ -116,7 +117,7 @@
#define EXV_HAVE_REALLOC 1
/* Define to 1 if stdbool.h conforms to C99. */
/* #undef EXV_HAVE_STDBOOL_H */
#define EXV_HAVE_STDBOOL_H 1
/* Define to 1 if you have the <stdint.h> header file. */
/* #undef EXV_HAVE_STDINT_H */
@@ -164,7 +165,7 @@
/* #undef EXV_HAVE_UNISTD_H */
/* Define to 1 if you have the `vprintf' function. */
#define EXV_HAVE_VPRINTF 1
/* #undef EXV_HAVE_VPRINTF */
/* Define to 1 if you have the <wchar.h> header file. */
/* #undef EXV_HAVE_WCHAR_H */
samples/exifprint.cpp
+18 -6
View File
@@ -8,28 +8,40 @@
#include <iomanip>
#include <cassert>
int main(int argc, char* const argv[])
#ifdef EXV_UNICODE_PATH
#define TCHAR wchar_t
#define _tstrcmp wcscmp
#define _T(s) L ##s
#else
#define TCHAR char
#define _tstrcmp strcmp
#define _T(s) s
#define wcout cout
#define wmain main
#endif
int wmain(int argc, TCHAR* const argv[])
try {
TCHAR* prog = argv[0];
TCHAR* file = argv[1];
if (argc != 2) {
std::cout << "Usage: " << argv[0] << " file\n";
std::wcout << _T("Usage: ") << prog << _T(" file") << std::endl;
return 1;
}
if ( strcmp(argv[1],"--version") == 0 ) {
if ( _tstrcmp(file,_T("--version")) == 0 ) {
exv_grep_keys_t keys;
Exiv2::dumpLibraryInfo(std::cout,keys);
return 0;
}
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(argv[1]);
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
if (exifData.empty()) {
std::string error(argv[1]);
error += ": No Exif data found in the file";
std::string error("No Exif data found in the file");
throw Exiv2::Error(1, error);
}
Exiv2::ExifData::const_iterator end = exifData.end();