Handle XMP tags for which static property information is not available.

2 files changed, 19 insertions, 4 deletions

diff --git a/src/exiv2wrapper.cpp b/src/exiv2wrapper.cpp
index 96e9536..1b9dd8d 100644
--- a/src/exiv2wrapper.cpp
+++ b/src/exiv2wrapper.cpp
@@ -634,11 +634,24 @@ XmpTag::XmpTag(const std::string& key, Exiv2::Xmpdatum* datum): _key(key)
         _datum = new Exiv2::Xmpdatum(_key);
     }
 
-    _title = Exiv2::XmpProperties::propertyTitle(_key);
-    _description = Exiv2::XmpProperties::propertyDesc(_key);
+    const char* title = Exiv2::XmpProperties::propertyTitle(_key);
+    if (title != 0)
+    {
+        _title = title;
+    }
+
+    const char* description = Exiv2::XmpProperties::propertyDesc(_key);
+    if (description != 0)
+    {
+        _description = description;
+    }
+
     const Exiv2::XmpPropertyInfo* info = Exiv2::XmpProperties::propertyInfo(_key);
-    _name = info->name_;
-    _type = info->xmpValueType_;
+    if (info != 0)
+    {
+        _name = info->name_;
+        _type = info->xmpValueType_;
+    }
 }
 
 /*void XmpTag::setRawValue(const std::string& value)
diff --git a/src/pyexiv2/xmp.py b/src/pyexiv2/xmp.py
index dc493d7..f63e0fb 100644
--- a/src/pyexiv2/xmp.py
+++ b/src/pyexiv2/xmp.py
@@ -125,6 +125,8 @@ class XmpTag(object):
             self._value = value
         elif self.type.lower().startswith('closed choice of'):
             self._value = self._convert_to_python(value, self.type[17:])
+        elif self.type == '':
+            self._value = value
         else:
             self._value = self._convert_to_python(value, self.type)