Slight simplification of BasicIo typemaps

jim-easterbrook · jim-easterbrook · commit 3b28dd1a16fb · 2025-09-18T12:15:33.000+01:00
There's no need to store 'self' and 'isWriteable' explicitly as they are
always args 1 &amp; 2.
diff --git a/src/interface/basicio.i b/src/interface/basicio.i
@@ -139,22 +139,14 @@ OUTPUT_BUFFER_RW(Exiv2::byte* buf, BUFLEN_T rcount)
 %ignore Exiv2::BasicIo::mmap();
 
 // Convert mmap() result to a Python memoryview
-RETURN_VIEW(Exiv2::byte* mmap, $1 ? _global_self->size() : 0,
-            _global_writeable ? PyBUF_WRITE : PyBUF_READ,)
-
-// Save self and isWriteable (and release memoryviews) when mmap or data
-// is called
-%typemap(check, fragment="memoryview_funcs")
-        (Exiv2::BasicIo* self, bool isWriteable)
-        (Exiv2::BasicIo* _global_self, bool _global_writeable) {
-    _global_self = $1;
-    _global_writeable = $2;
-    release_views(self);
-}
+RETURN_VIEW(Exiv2::byte* mmap, $1 ? arg1->size() : 0,
+            arg2 ? PyBUF_WRITE : PyBUF_READ,)
 
 // Some methods of BasicIo release any existing memoryview
 %{
 #define RELEASE_VIEWS_BasicIo_close
+#define RELEASE_VIEWS_BasicIo_data
+#define RELEASE_VIEWS_BasicIo_mmap
 #define RELEASE_VIEWS_BasicIo_munmap
 #define RELEASE_VIEWS_BasicIo_open
 #define RELEASE_VIEWS_BasicIo_putb
@@ -169,8 +161,8 @@ RETURN_VIEW(Exiv2::byte* mmap, $1 ? _global_self->size() : 0,
 
 // Add data() method for easy access
 // The callback is used to call munmap when the memoryview is deleted
-RETURN_VIEW(Exiv2::byte* data, $1 ? _global_self->size() : 0,
-            _global_writeable ? PyBUF_WRITE : PyBUF_READ,)
+RETURN_VIEW(Exiv2::byte* data, $1 ? arg1->size() : 0,
+            arg2 ? PyBUF_WRITE : PyBUF_READ,)
 %feature("docstring") Exiv2::BasicIo::data
 "Easy access to the IO data.
 
diff --git a/src/swig-0_27_7/basicio_wrap.cxx b/src/swig-0_27_7/basicio_wrap.cxx
@@ -4334,6 +4334,8 @@ typedef Exiv2::ErrorCode ErrorCode;
 
 
 #define RELEASE_VIEWS_BasicIo_close
+#define RELEASE_VIEWS_BasicIo_data
+#define RELEASE_VIEWS_BasicIo_mmap
 #define RELEASE_VIEWS_BasicIo_munmap
 #define RELEASE_VIEWS_BasicIo_open
 #define RELEASE_VIEWS_BasicIo_putb
@@ -5467,8 +5469,6 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  Exiv2::BasicIo *_global_self ;
-  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
   
@@ -5489,9 +5489,9 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
-    _global_self = arg1;
-    _global_writeable = arg2;
+#ifdef RELEASE_VIEWS_BasicIo_mmap
     release_views(self);
+#endif
   }
   {
     try {
@@ -5507,7 +5507,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     }
   }
   {
-    resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
+    resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
     if (!resultobj)
     SWIG_fail;
     // Store a weak ref to the new memoryview
@@ -5783,8 +5783,6 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  Exiv2::BasicIo *_global_self ;
-  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
   
@@ -5805,9 +5803,9 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
-    _global_self = arg1;
-    _global_writeable = arg2;
+#ifdef RELEASE_VIEWS_BasicIo_data
     release_views(self);
+#endif
   }
   {
     try {
@@ -5823,7 +5821,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     }
   }
   {
-    resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
+    resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
     if (!resultobj)
     SWIG_fail;
     // Store a weak ref to the new memoryview
diff --git a/src/swig-0_28_7/basicio_wrap.cxx b/src/swig-0_28_7/basicio_wrap.cxx
@@ -4333,6 +4333,8 @@ typedef Exiv2::ErrorCode ErrorCode;
 
 
 #define RELEASE_VIEWS_BasicIo_close
+#define RELEASE_VIEWS_BasicIo_data
+#define RELEASE_VIEWS_BasicIo_mmap
 #define RELEASE_VIEWS_BasicIo_munmap
 #define RELEASE_VIEWS_BasicIo_open
 #define RELEASE_VIEWS_BasicIo_putb
@@ -5730,8 +5732,6 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  Exiv2::BasicIo *_global_self ;
-  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
   
@@ -5752,9 +5752,9 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
-    _global_self = arg1;
-    _global_writeable = arg2;
+#ifdef RELEASE_VIEWS_BasicIo_mmap
     release_views(self);
+#endif
   }
   {
     try {
@@ -5770,7 +5770,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_mmap(PyObject *self, PyObject *args) {
     }
   }
   {
-    resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
+    resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
     if (!resultobj)
     SWIG_fail;
     // Store a weak ref to the new memoryview
@@ -6048,8 +6048,6 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  Exiv2::BasicIo *_global_self ;
-  bool _global_writeable ;
   PyObject * obj1 = 0 ;
   Exiv2::byte *result = 0 ;
   
@@ -6070,9 +6068,9 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     arg2 = static_cast< bool >(val2);
   }
   {
-    _global_self = arg1;
-    _global_writeable = arg2;
+#ifdef RELEASE_VIEWS_BasicIo_data
     release_views(self);
+#endif
   }
   {
     try {
@@ -6088,7 +6086,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_data(PyObject *self, PyObject *args) {
     }
   }
   {
-    resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);
+    resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);
     if (!resultobj)
     SWIG_fail;
     // Store a weak ref to the new memoryview

Original file line number	Diff line number	Diff line change
`@@ -4334,6 +4334,8 @@ typedef Exiv2::ErrorCode ErrorCode;`
`4334`	`4334`
`4335`	`4335`
`4336`	`4336`	`#define RELEASE_VIEWS_BasicIo_close`
	`4337`	`+#define RELEASE_VIEWS_BasicIo_data`
	`4338`	`+#define RELEASE_VIEWS_BasicIo_mmap`
`4337`	`4339`	`#define RELEASE_VIEWS_BasicIo_munmap`
`4338`	`4340`	`#define RELEASE_VIEWS_BasicIo_open`
`4339`	`4341`	`#define RELEASE_VIEWS_BasicIo_putb`
`@@ -5467,8 +5469,6 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5467`	`5469`	`int res1 = 0 ;`
`5468`	`5470`	`bool val2 ;`
`5469`	`5471`	`int ecode2 = 0 ;`
`5470`		`- Exiv2::BasicIo *_global_self ;`
`5471`		`- bool _global_writeable ;`
`5472`	`5472`	`PyObject * obj1 = 0 ;`
`5473`	`5473`	`Exiv2::byte *result = 0 ;`
`5474`	`5474`
`@@ -5489,9 +5489,9 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5489`	`5489`	`arg2 = static_cast< bool >(val2);`
`5490`	`5490`	`}`
`5491`	`5491`	`{`
`5492`		`- _global_self = arg1;`
`5493`		`- _global_writeable = arg2;`
	`5492`	`+#ifdef RELEASE_VIEWS_BasicIo_mmap`
`5494`	`5493`	`release_views(self);`
	`5494`	`+#endif`
`5495`	`5495`	`}`
`5496`	`5496`	`{`
`5497`	`5497`	`try {`
`@@ -5507,7 +5507,7 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5507`	`5507`	`}`
`5508`	`5508`	`}`
`5509`	`5509`	`{`
`5510`		`- resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);`
	`5510`	`+ resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);`
`5511`	`5511`	`if (!resultobj)`
`5512`	`5512`	`SWIG_fail;`
`5513`	`5513`	`// Store a weak ref to the new memoryview`
`@@ -5783,8 +5783,6 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`5783`	`5783`	`int res1 = 0 ;`
`5784`	`5784`	`bool val2 ;`
`5785`	`5785`	`int ecode2 = 0 ;`
`5786`		`- Exiv2::BasicIo *_global_self ;`
`5787`		`- bool _global_writeable ;`
`5788`	`5786`	`PyObject * obj1 = 0 ;`
`5789`	`5787`	`Exiv2::byte *result = 0 ;`
`5790`	`5788`
`@@ -5805,9 +5803,9 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`5805`	`5803`	`arg2 = static_cast< bool >(val2);`
`5806`	`5804`	`}`
`5807`	`5805`	`{`
`5808`		`- _global_self = arg1;`
`5809`		`- _global_writeable = arg2;`
	`5806`	`+#ifdef RELEASE_VIEWS_BasicIo_data`
`5810`	`5807`	`release_views(self);`
	`5808`	`+#endif`
`5811`	`5809`	`}`
`5812`	`5810`	`{`
`5813`	`5811`	`try {`
`@@ -5823,7 +5821,7 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`5823`	`5821`	`}`
`5824`	`5822`	`}`
`5825`	`5823`	`{`
`5826`		`- resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);`
	`5824`	`+ resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);`
`5827`	`5825`	`if (!resultobj)`
`5828`	`5826`	`SWIG_fail;`
`5829`	`5827`	`// Store a weak ref to the new memoryview`
Original file line number	Diff line number	Diff line change
`@@ -4333,6 +4333,8 @@ typedef Exiv2::ErrorCode ErrorCode;`
`4333`	`4333`
`4334`	`4334`
`4335`	`4335`	`#define RELEASE_VIEWS_BasicIo_close`
	`4336`	`+#define RELEASE_VIEWS_BasicIo_data`
	`4337`	`+#define RELEASE_VIEWS_BasicIo_mmap`
`4336`	`4338`	`#define RELEASE_VIEWS_BasicIo_munmap`
`4337`	`4339`	`#define RELEASE_VIEWS_BasicIo_open`
`4338`	`4340`	`#define RELEASE_VIEWS_BasicIo_putb`
`@@ -5730,8 +5732,6 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5730`	`5732`	`int res1 = 0 ;`
`5731`	`5733`	`bool val2 ;`
`5732`	`5734`	`int ecode2 = 0 ;`
`5733`		`- Exiv2::BasicIo *_global_self ;`
`5734`		`- bool _global_writeable ;`
`5735`	`5735`	`PyObject * obj1 = 0 ;`
`5736`	`5736`	`Exiv2::byte *result = 0 ;`
`5737`	`5737`
`@@ -5752,9 +5752,9 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5752`	`5752`	`arg2 = static_cast< bool >(val2);`
`5753`	`5753`	`}`
`5754`	`5754`	`{`
`5755`		`- _global_self = arg1;`
`5756`		`- _global_writeable = arg2;`
	`5755`	`+#ifdef RELEASE_VIEWS_BasicIo_mmap`
`5757`	`5756`	`release_views(self);`
	`5757`	`+#endif`
`5758`	`5758`	`}`
`5759`	`5759`	`{`
`5760`	`5760`	`try {`
`@@ -5770,7 +5770,7 @@ SWIGINTERN PyObject _wrap_BasicIo_mmap(PyObject self, PyObject *args) {`
`5770`	`5770`	`}`
`5771`	`5771`	`}`
`5772`	`5772`	`{`
`5773`		`- resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);`
	`5773`	`+ resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);`
`5774`	`5774`	`if (!resultobj)`
`5775`	`5775`	`SWIG_fail;`
`5776`	`5776`	`// Store a weak ref to the new memoryview`
`@@ -6048,8 +6048,6 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`6048`	`6048`	`int res1 = 0 ;`
`6049`	`6049`	`bool val2 ;`
`6050`	`6050`	`int ecode2 = 0 ;`
`6051`		`- Exiv2::BasicIo *_global_self ;`
`6052`		`- bool _global_writeable ;`
`6053`	`6051`	`PyObject * obj1 = 0 ;`
`6054`	`6052`	`Exiv2::byte *result = 0 ;`
`6055`	`6053`
`@@ -6070,9 +6068,9 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`6070`	`6068`	`arg2 = static_cast< bool >(val2);`
`6071`	`6069`	`}`
`6072`	`6070`	`{`
`6073`		`- _global_self = arg1;`
`6074`		`- _global_writeable = arg2;`
	`6071`	`+#ifdef RELEASE_VIEWS_BasicIo_data`
`6075`	`6072`	`release_views(self);`
	`6073`	`+#endif`
`6076`	`6074`	`}`
`6077`	`6075`	`{`
`6078`	`6076`	`try {`
`@@ -6088,7 +6086,7 @@ SWIGINTERN PyObject _wrap_BasicIo_data(PyObject self, PyObject *args) {`
`6088`	`6086`	`}`
`6089`	`6087`	`}`
`6090`	`6088`	`{`
`6091`		`- resultobj = PyMemoryView_FromMemory((char*)result, result ? _global_self->size() : 0, _global_writeable ? PyBUF_WRITE : PyBUF_READ);`
	`6089`	`+ resultobj = PyMemoryView_FromMemory((char*)result, result ? arg1->size() : 0, arg2 ? PyBUF_WRITE : PyBUF_READ);`
`6092`	`6090`	`if (!resultobj)`
`6093`	`6091`	`SWIG_fail;`
`6094`	`6092`	`// Store a weak ref to the new memoryview`