Defined BUFLEN_T for 0.27/0.28 data len type change

Author: jim-easterbrook

src/interface/basicio.i

@@ -130,12 +130,10 @@ typedef Exiv2::ErrorCode ErrorCode;
 KEEP_REFERENCE(Exiv2::BasicIo&)
 
 // Allow BasicIo::write to take any Python buffer
-INPUT_BUFFER_RO(const Exiv2::byte* data, long wcount)
-INPUT_BUFFER_RO(const Exiv2::byte* data, size_t wcount)
+INPUT_BUFFER_RO(const Exiv2::byte* data, BUFLEN_T wcount)
 
 // BasicIo::read can write to a Python buffer
-OUTPUT_BUFFER_RW(Exiv2::byte* buf, long rcount)
-OUTPUT_BUFFER_RW(Exiv2::byte* buf, size_t rcount)
+OUTPUT_BUFFER_RW(Exiv2::byte* buf, BUFLEN_T rcount)
 
 // Use default typemap for isWriteable parameter.
 %typemap(default) bool isWriteable {$1 = false;}

src/interface/exif.i

@@ -50,11 +50,7 @@ EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::ExifThumbC::writeFile)
 // ExifThumb keeps a reference to the ExifData it uses
 KEEP_REFERENCE_EX(Exiv2::ExifThumb*, args)
 
-#if EXIV2_VERSION_HEX < 0x001c0000
-INPUT_BUFFER_RO(const Exiv2::byte* buf, long size)
-#else
-INPUT_BUFFER_RO(const Exiv2::byte* buf, size_t size)
-#endif
+INPUT_BUFFER_RO(const Exiv2::byte* buf, BUFLEN_T size)
 
 EXTEND_METADATUM(Exiv2::Exifdatum)
 

src/interface/image.i

@@ -56,9 +56,7 @@ UNIQUE_PTR(Exiv2::Image);
 %thread Exiv2::ImageFactory::open;
 
 // ImageFactory can open image or get type from a buffer
-INPUT_BUFFER_RO(const Exiv2::byte* data, long size,
-                ImageFactory_open, ImageFactory_createIo)
-INPUT_BUFFER_RO(const Exiv2::byte* data, size_t size,
+INPUT_BUFFER_RO(const Exiv2::byte* data, BUFLEN_T size,
                 ImageFactory_open, ImageFactory_createIo)
 
 // Release memory buffer after writeMetadata, as it creates its own copy
@@ -117,7 +115,7 @@ Create a MemIo subclass of BasicIo using the provided memory.
 "
 %extend Exiv2::ImageFactory {
     static Exiv2::BasicIo::SMART_PTR createIo(
-        const Exiv2::byte* data, size_t size) {
+        const Exiv2::byte* data, BUFLEN_T size) {
 #if EXIV2_VERSION_HEX < 0x001c0000
         return Exiv2::BasicIo::AutoPtr(new Exiv2::MemIo(data, size));
 #else

src/interface/metadatum.i

@@ -39,8 +39,7 @@ EXCEPTION()
 %ignore Exiv2::Metadatum::toLong() const;
 %ignore Exiv2::Metadatum::toRational() const;
 %ignore Exiv2::Metadatum::toString() const;
-%ignore Exiv2::Metadatum::toString(long) const;
-%ignore Exiv2::Metadatum::toString(size_t) const;
+%ignore Exiv2::Metadatum::toString(BUFLEN_T) const;
 %ignore Exiv2::Metadatum::toUint32() const;
 
 // Use default parameter in print() and write()
@@ -118,7 +117,7 @@ static PyObject* set_value_from_py(datum_type* datum, PyObject* py_value) {
     }
     // toString parameter does not default to 0, so bypass default typemap
     std::string toString() const { return self->toString(); }
-    std::string toString(size_t i) const { return self->toString(i); }
+    std::string toString(BUFLEN_T i) const { return self->toString(i); }
 }
 %enddef // EXTEND_METADATUM
 

src/interface/shared/preamble.i

@@ -40,6 +40,13 @@
 #define EXV_DLLLOCAL
 #define EXV_DLLPUBLIC
 
+// Data sizes have different types in exiv2 0.27 and 0.28
+#if EXIV2_VERSION_HEX < 0x001c0000
+#define BUFLEN_T long
+#else
+#define BUFLEN_T size_t
+#endif
+
 // Stuff to handle auto_ptr or unique_ptr
 #if EXIV2_VERSION_HEX < 0x001c0000
     #define SMART_PTR AutoPtr

src/interface/types.i

@@ -221,11 +221,7 @@ DEFINE_ENUM(TypeId, "Exiv2 value type identifiers.\n"
 %}
 
 // Allow Exiv2::DataBuf to be initialised from a Python buffer
-#if EXIV2_VERSION_HEX < 0x001c0000
-INPUT_BUFFER_RO(const Exiv2::byte *pData, long size)
-#else
-INPUT_BUFFER_RO(const Exiv2::byte *pData, size_t size)
-#endif
+INPUT_BUFFER_RO(const Exiv2::byte *pData, BUFLEN_T size)
 
 // Expose Exiv2::DataBuf contents as a Python buffer
 %fragment("get_ptr_size"{Exiv2::DataBuf}, "header") {

src/interface/value.i

@@ -88,11 +88,8 @@ UNIQUE_PTR(Exiv2::Value);
     }
 %}
 // DataValue constructor and DataValue::read can take a Python buffer
-#if EXIV2_VERSION_HEX < 0x001c0000
-INPUT_BUFFER_RO(const Exiv2::byte* buf, long len)
-#else
-INPUT_BUFFER_RO(const Exiv2::byte* buf, size_t len)
-#endif
+INPUT_BUFFER_RO(const Exiv2::byte* buf, BUFLEN_T len)
+
 // Value::copy can write to a Python buffer
 OUTPUT_BUFFER_RW(Exiv2::byte* buf,)
 
@@ -196,10 +193,8 @@ static swig_type_info* get_swig_type(Exiv2::Value* value) {
 
 // Ignore now redundant overloaded methods
 %ignore Exiv2::DataValue::DataValue();
-%ignore Exiv2::DataValue::DataValue(byte const *, long);
-%ignore Exiv2::DataValue::DataValue(byte const *, long, ByteOrder);
-%ignore Exiv2::DataValue::DataValue(byte const *, size_t);
-%ignore Exiv2::DataValue::DataValue(byte const *, size_t, ByteOrder);
+%ignore Exiv2::DataValue::DataValue(byte const *, BUFLEN_T);
+%ignore Exiv2::DataValue::DataValue(byte const *, BUFLEN_T, ByteOrder);
 %ignore Exiv2::Value::toFloat() const;
 %ignore Exiv2::Value::toInt64() const;
 %ignore Exiv2::Value::toLong() const;
@@ -252,8 +247,7 @@ DEPRECATED_ENUM(XmpValue, XmpStruct, "XMP structure indicator.",
 %ignore type_name::value_;
 // Ignore overloaded methods replaced by default typemaps
 %ignore type_name::copy(byte *) const;
-%ignore type_name::read(byte const *, long);
-%ignore type_name::read(byte const *, size_t);
+%ignore type_name::read(byte const *, BUFLEN_T);
 %noexception type_name::~part_name;
 %noexception type_name::__getitem__;
 %noexception type_name::__setitem__;
@@ -271,13 +265,10 @@ VALUE_SUBCLASS(Exiv2::ValueType<item_type>, type_name)
 // Ignore now overloaded constructors
 %ignore Exiv2::ValueType<item_type>::ValueType(item_type const &);
 #if EXIV2_VERSION_HEX < 0x001c0000
-%ignore Exiv2::ValueType<item_type>::ValueType(
-    byte const *, long, ByteOrder);
 %ignore Exiv2::ValueType<item_type>::ValueType();
-#else
-%ignore Exiv2::ValueType<item_type>::ValueType(
-    byte const *, size_t, ByteOrder);
 #endif
+%ignore Exiv2::ValueType<item_type>::ValueType(
+    byte const *, BUFLEN_T, ByteOrder);
 // Also need to ignore equivalent primitive type definitions
 %ignore Exiv2::ValueType<item_type>::ValueType(short const &);
 %ignore Exiv2::ValueType<item_type>::ValueType(unsigned short const &);