Fixed compilation error when configuration flag --disable-xmp is used.

v0.27.3
Andreas Huggel 17 years ago
parent 7e4cecf11b
commit ed89a70db3

@ -388,10 +388,10 @@ namespace Exiv2 {
} }
} }
#ifdef EXV_HAVE_XMP_TOOLKIT
bool XmpParser::registerNs(const std::string& ns, bool XmpParser::registerNs(const std::string& ns,
const std::string& prefix) const std::string& prefix)
{ {
#ifdef EXV_HAVE_XMP_TOOLKIT
try { try {
initialize(); initialize();
return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0); return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
@ -399,11 +399,15 @@ namespace Exiv2 {
catch (const XMP_Error& e) { catch (const XMP_Error& e) {
throw Error(40, e.GetID(), e.GetErrMsg()); throw Error(40, e.GetID(), e.GetErrMsg());
} }
} // XmpParser::registerNs
#else #else
bool XmpParser::registerNs(const std::string& /*ns*/,
const std::string& /*prefix*/)
{
initialize(); initialize();
return true; return true;
#endif
} // XmpParser::registerNs } // XmpParser::registerNs
#endif
void XmpParser::unregisterNs(const std::string& /*ns*/) void XmpParser::unregisterNs(const std::string& /*ns*/)
{ {
@ -663,8 +667,10 @@ namespace Exiv2 {
return 3; return 3;
}} // XmpParser::decode }} // XmpParser::decode
#else #else
int XmpParser::encode( std::string& xmpPacket, int XmpParser::encode( std::string& /*xmpPacket*/,
const XmpData& xmpData) const XmpData& xmpData,
uint16_t /*formatFlags*/,
uint32_t /*padding*/)
{ {
if (!xmpData.empty()) { if (!xmpData.empty()) {
#ifndef SUPPRESS_WARNINGS #ifndef SUPPRESS_WARNINGS

Loading…
Cancel
Save