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

#1145. Correction to r4149 to fix msvc build-breaker.

Browse Source
This commit is contained in:
Robin Mills 2015-12-27 12:01:04 +00:00
parent f0901bea3c
commit 3af7088e4e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/minoltamn.cpp
View File

@ -1944,16 +1944,13 @@ namespace Exiv2 {
// 2 can't work for a remote file as exiftool doesn't handle remote IO
// 3 almost certainly throws an ugly ugly dos box on the screen in Windows
// 4 I haven't asked Phil's permission to do this
//
static std::ostream& resolveLensTypeUsingExiftool(std::ostream& os, const Value& value,
const ExifData* metadata)
{
bool bFixed = false;
// #if ! defined(WIN32) && ! defined(__CYGWIN__) && ! defined(__MINGW__)
#ifndef _MSC_VER
FILE* f = ::popen("/bin/bash -c \"exiftool ~/temp/screen.jpg | grep 'Lens ID' | cut -d: -f 2 | sed -E -e 's/^ //g'\"","r");
if ( f ) {
bFixed = true;
char buffer[200];
int n=::fread(buffer,1,sizeof buffer-1,f);
::pclose(f);
@ -1966,9 +1963,8 @@ namespace Exiv2 {
*::strchr(buffer,c)=0;
return os << buffer;
}
return os;
#endif
if ( !bFixed ) return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
}
static std::ostream& resolveLensTypeTamron(std::ostream& os, const Value& value,