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

Partially updated MSVC project (samples and XMP don't compile).

Browse Source
This commit is contained in:
Andreas Huggel 2007-11-01 02:47:04 +00:00
parent d83c6fd963
commit 08c2c50448
18 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -50,7 +50,7 @@
########################################################################
SHELL = /bin/sh
ENABLE_XMP = 1
ENABLE_XMP =
.PHONY: all doc config samples xmpsdk \
mostlyclean clean distclean maintainer-clean \

2
msvc/addmoddel/addmoddel.vcproj
View File

@ -124,7 +124,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\addmoddel.cpp">
RelativePath="..\..\samples\addmoddel.cpp">
</File>
</Filter>
<Filter

2
msvc/crwparse/crwparse.vcproj
View File

@ -114,7 +114,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\crwparse.cpp">
RelativePath="..\..\samples\crwparse.cpp">
</File>
</Filter>
<Filter

2
msvc/exifcomment/exifcomment.vcproj
View File

@ -124,7 +124,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\exifcomment.cpp">
RelativePath="..\..\samples\exifcomment.cpp">
</File>
</Filter>
<Filter

2
msvc/exifdata-test/exifdata-test.vcproj
View File

@ -114,7 +114,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\exifdata-test.cpp">
RelativePath="..\..\samples\exifdata-test.cpp">
</File>
</Filter>
<Filter

2
msvc/exifprint/exifprint.vcproj
View File

@ -124,7 +124,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\exifprint.cpp">
RelativePath="..\..\samples\exifprint.cpp">
</File>
</Filter>
<Filter

6
msvc/exiv2lib/exiv2lib.vcproj
View File

@ -313,6 +313,9 @@
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\pentaxmn.cpp">
</File>
<File
RelativePath="..\..\src\rafimage.cpp">
</File>
@ -546,6 +549,9 @@
<File
RelativePath="..\..\src\panasonicmn.hpp">
</File>
<File
RelativePath="..\..\src\pentaxmn.hpp">
</File>
<File
RelativePath="..\..\src\properties.hpp">
</File>

2
msvc/ifd-test/ifd-test.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\ifd-test.cpp">
RelativePath="..\..\samples\ifd-test.cpp">
</File>
</Filter>
<Filter

2
msvc/iotest/iotest.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\iotest.cpp">
RelativePath="..\..\samples\iotest.cpp">
</File>
</Filter>
<Filter

2
msvc/iptceasy/iptceasy.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\iptceasy.cpp">
RelativePath="..\..\samples\iptceasy.cpp">
</File>
</Filter>
<Filter

2
msvc/iptcprint/iptcprint.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\iptcprint.cpp">
RelativePath="..\..\samples\iptcprint.cpp">
</File>
</Filter>
<Filter

2
msvc/iptctest/iptctest.vcproj
View File

@ -123,7 +123,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\iptctest.cpp">
RelativePath="..\..\samples\iptctest.cpp">
</File>
</Filter>
<Filter

2
msvc/largeiptc-test/largeiptc-test.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\largeiptc-test.cpp">
RelativePath="..\..\samples\largeiptc-test.cpp">
</File>
</Filter>
<Filter

2
msvc/makernote-test/makernote-test.vcproj
View File

@ -122,7 +122,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\makernote-test.cpp">
RelativePath="..\..\samples\makernote-test.cpp">
</File>
</Filter>
<Filter

2
msvc/write-test/write-test.vcproj
View File

@ -124,7 +124,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\write-test.cpp">
RelativePath="..\..\samples\write-test.cpp">
</File>
</Filter>
<Filter

2
msvc/write2-test/write2-test.vcproj
View File

@ -124,7 +124,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\write2-test.cpp">
RelativePath="..\..\samples\write2-test.cpp">
</File>
</Filter>
<Filter

2
src/taglist.cpp
View File

@ -47,7 +47,7 @@ try {
try {
XmpProperties::printProperties(std::cout, item);
}
catch(const AnyError& e) {
catch(const AnyError&) {
rc = 2;
}

17
src/xmp.cpp
View File

@ -381,17 +381,20 @@ namespace Exiv2 {
bool XmpParser::registerNs(const std::string& ns,
const std::string& prefix)
{ try {
initialize();
{
#ifdef EXV_HAVE_XMP_TOOLKIT
return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
try {
initialize();
return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
}
catch (const XMP_Error& e) {
throw Error(40, e.GetID(), e.GetErrMsg());
}
#else
initialize();
return true;
#endif
}
catch (const XMP_Error& e) {
throw Error(40, e.GetID(), e.GetErrMsg());
}} // XmpParser::registerNs
} // XmpParser::registerNs
#ifdef EXV_HAVE_XMP_TOOLKIT
int XmpParser::decode( XmpData& xmpData,