Update to allow EXV_ENABLE_FILESYSTEM off

Author: jim-easterbrook

src/interface/basicio.i

@@ -43,6 +43,7 @@ EXCEPTION()
 
 %fragment("EXV_USE_CURL");
 %fragment("EXV_USE_SSH");
+%fragment("EXV_ENABLE_FILESYSTEM");
 
 UNIQUE_PTR(Exiv2::BasicIo);
 

src/interface/exif.i

@@ -29,6 +29,7 @@
 %include "shared/data_iterator.i"
 %include "shared/enum.i"
 %include "shared/exception.i"
+%include "shared/exv_options.i"
 %include "shared/keep_reference.i"
 %include "shared/windows_path.i"
 
@@ -43,6 +44,12 @@ IMPORT_ENUM(TypeId)
 // Catch all C++ exceptions
 EXCEPTION()
 
+EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::ExifThumb::setJpegThumbnail(
+    const std::string&))
+EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::ExifThumb::setJpegThumbnail(
+    const std::string&, URational, URational, uint16_t))
+EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::ExifThumbC::writeFile)
+
 // ExifThumb keeps a reference to the ExifData it uses
 KEEP_REFERENCE_EX(Exiv2::ExifThumb*, args)
 

src/interface/image.i

@@ -48,6 +48,9 @@ EXCEPTION()
 
 %fragment("EXV_USE_CURL");
 %fragment("EXV_USE_SSH");
+%fragment("EXV_ENABLE_FILESYSTEM");
+EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::ImageFactory::create(
+    ImageType, const std::string&))
 
 UNIQUE_PTR(Exiv2::Image);
 

src/interface/preview.i

@@ -44,6 +44,8 @@ EXCEPTION()
 
 %fragment("EXV_USE_CURL");
 %fragment("EXV_USE_SSH");
+%fragment("EXV_ENABLE_FILESYSTEM");
+EXV_ENABLE_FILESYSTEM_FUNCTION(Exiv2::PreviewImage::writeFile)
 
 // Some calls don't raise exceptions
 %noexception Exiv2::PreviewImage::__len__;

src/interface/shared/exv_options.i

@@ -33,3 +33,44 @@ namespace Exiv2 {
 }
 #endif // EXV_USE_SSH
 %}
+
+// Fragment to set EXV_ENABLE_FILESYSTEM on old libexiv2 versions
+%fragment("set_EXV_ENABLE_FILESYSTEM", "header") %{
+#if !EXIV2_TEST_VERSION(0, 28, 3)
+#define EXV_ENABLE_FILESYSTEM
+#endif
+// Copy EXV_ENABLE_FILESYSTEM for use in macro
+#ifdef EXV_ENABLE_FILESYSTEM
+#define _EXV_ENABLE_FILESYSTEM
+#endif
+%}
+
+// Fragment to define FileIo and XPathIo if EXV_ENABLE_FILESYSTEM is OFF
+%fragment("EXV_ENABLE_FILESYSTEM", "header",
+          fragment="set_EXV_ENABLE_FILESYSTEM") %{
+#ifndef EXV_ENABLE_FILESYSTEM
+namespace Exiv2 {
+    class FileIo : public BasicIo {};
+    class XPathIo : public MemIo {};
+}
+#endif // EXV_ENABLE_FILESYSTEM
+%}
+
+// Macro to not call a function if EXV_ENABLE_FILESYSTEM is OFF
+%define EXV_ENABLE_FILESYSTEM_FUNCTION(signature)
+%fragment("_set_python_exception");
+%fragment("set_EXV_ENABLE_FILESYSTEM");
+%exception signature {
+    try {
+%#ifdef _EXV_ENABLE_FILESYSTEM
+        $action
+%#else
+        throw Exiv2::Error(Exiv2::ErrorCode::kerFunctionNotSupported);
+%#endif
+    }
+    catch(std::exception const& e) {
+        _set_python_exception();
+        SWIG_fail;
+    }
+}
+%enddef // EXV_ENABLE_FILESYSTEM_FUNCTION

src/interface/version.i

@@ -23,6 +23,7 @@
 
 %include "shared/preamble.i"
 %include "shared/exception.i"
+%include "shared/exv_options.i"
 
 %include "stdint.i"
 %include "std_string.i"
@@ -39,6 +40,7 @@ EXCEPTION()
 
 // Function to report build options used
 %feature("docstring") versionInfo "Return a dict of libexiv2 build options."
+%fragment("set_EXV_ENABLE_FILESYSTEM");
 %inline %{
 static PyObject* versionInfo() {
     bool nls = false;

src/swig-0_27_3/basicio_wrap.cxx

@@ -4290,6 +4290,23 @@ namespace Exiv2 {
 #endif // EXV_USE_SSH
 
 
+#if !EXIV2_TEST_VERSION(0, 28, 3)
+#define EXV_ENABLE_FILESYSTEM
+#endif
+// Copy EXV_ENABLE_FILESYSTEM for use in macro
+#ifdef EXV_ENABLE_FILESYSTEM
+#define _EXV_ENABLE_FILESYSTEM
+#endif
+
+
+#ifndef EXV_ENABLE_FILESYSTEM
+namespace Exiv2 {
+    class FileIo : public BasicIo {};
+    class XPathIo : public MemIo {};
+}
+#endif // EXV_ENABLE_FILESYSTEM
+
+
 typedef Exiv2::ErrorCode ErrorCode;
 
 

src/swig-0_27_3/exif_wrap.cxx

@@ -4313,6 +4313,15 @@ static void _set_python_exception() {
 };
 
 
+#if !EXIV2_TEST_VERSION(0, 28, 3)
+#define EXV_ENABLE_FILESYSTEM
+#endif
+// Copy EXV_ENABLE_FILESYSTEM for use in macro
+#ifdef EXV_ENABLE_FILESYSTEM
+#define _EXV_ENABLE_FILESYSTEM
+#endif
+
+
 // Base class implements all methods except dereferencing
 class ExifData_iterator_base {
 protected:
@@ -8649,7 +8658,11 @@ SWIGINTERN PyObject *_wrap_ExifThumbC_writeFile(PyObject *self, PyObject *args)
   }
   {
     try {
+#ifdef _EXV_ENABLE_FILESYSTEM
       result = (long)((Exiv2::ExifThumbC const *)arg1)->writeFile((std::string const &)*arg2);
+#else
+      throw Exiv2::Error(Exiv2::ErrorCode::kerFunctionNotSupported);
+#endif
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -8859,7 +8872,11 @@ SWIGINTERN PyObject *_wrap_ExifThumb_setJpegThumbnail__SWIG_0(PyObject *self, Py
   }
   {
     try {
+#ifdef _EXV_ENABLE_FILESYSTEM
       (arg1)->setJpegThumbnail((std::string const &)*arg2,arg3,arg4,arg5);
+#else
+      throw Exiv2::Error(Exiv2::ErrorCode::kerFunctionNotSupported);
+#endif
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -8990,7 +9007,11 @@ SWIGINTERN PyObject *_wrap_ExifThumb_setJpegThumbnail__SWIG_2(PyObject *self, Py
   }
   {
     try {
+#ifdef _EXV_ENABLE_FILESYSTEM
       (arg1)->setJpegThumbnail((std::string const &)*arg2);
+#else
+      throw Exiv2::Error(Exiv2::ErrorCode::kerFunctionNotSupported);
+#endif
     }
     catch(std::exception const& e) {
       _set_python_exception();

src/swig-0_27_3/image_wrap.cxx

@@ -4341,6 +4341,23 @@ namespace Exiv2 {
 #endif // EXV_USE_SSH
 
 
+#if !EXIV2_TEST_VERSION(0, 28, 3)
+#define EXV_ENABLE_FILESYSTEM
+#endif
+// Copy EXV_ENABLE_FILESYSTEM for use in macro
+#ifdef EXV_ENABLE_FILESYSTEM
+#define _EXV_ENABLE_FILESYSTEM
+#endif
+
+
+#ifndef EXV_ENABLE_FILESYSTEM
+namespace Exiv2 {
+    class FileIo : public BasicIo {};
+    class XPathIo : public MemIo {};
+}
+#endif // EXV_ENABLE_FILESYSTEM
+
+
 static bool enableBMFF(bool enable) {
 #ifdef EXV_ENABLE_BMFF
     return Exiv2::enableBMFF(enable);

src/swig-0_27_3/preview_wrap.cxx

@@ -4496,6 +4496,23 @@ namespace Exiv2 {
 #endif // EXV_USE_SSH
 
 
+#if !EXIV2_TEST_VERSION(0, 28, 3)
+#define EXV_ENABLE_FILESYSTEM
+#endif
+// Copy EXV_ENABLE_FILESYSTEM for use in macro
+#ifdef EXV_ENABLE_FILESYSTEM
+#define _EXV_ENABLE_FILESYSTEM
+#endif
+
+
+#ifndef EXV_ENABLE_FILESYSTEM
+namespace Exiv2 {
+    class FileIo : public BasicIo {};
+    class XPathIo : public MemIo {};
+}
+#endif // EXV_ENABLE_FILESYSTEM
+
+
 namespace swig {
   template <class Type>
   struct noconst_traits {
@@ -6379,7 +6396,11 @@ SWIGINTERN PyObject *_wrap_PreviewImage_writeFile(PyObject *self, PyObject *args
   }
   {
     try {
+#ifdef _EXV_ENABLE_FILESYSTEM
       result = (long)((Exiv2::PreviewImage const *)arg1)->writeFile((std::string const &)*arg2);
+#else
+      throw Exiv2::Error(Exiv2::ErrorCode::kerFunctionNotSupported);
+#endif
     }
     catch(std::exception const& e) {
       _set_python_exception();