summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-12 23:38:48 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-13 11:21:29 +0200
commit7f343fdd68ff4def7e6083fa14258b14867e04e4 (patch)
tree646ffaf1b8f9b12b37b20c5a662a9b51f643ddae /sci-libs/gdal/files
parentmedia-radio/flrig: x86 stable wrt bug #717284 (diff)
downloadgentoo-7f343fdd68ff4def7e6083fa14258b14867e04e4.tar.gz
gentoo-7f343fdd68ff4def7e6083fa14258b14867e04e4.tar.bz2
gentoo-7f343fdd68ff4def7e6083fa14258b14867e04e4.zip
sci-libs/gdal: Drop 2.4.1-r1 and 2.4.3
Bug: https://bugs.gentoo.org/699838 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r--sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch12
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch148
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch24
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch53
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch27
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch42
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-swig-4.patch115
7 files changed, 0 insertions, 421 deletions
diff --git a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
deleted file mode 100644
index 620b05fecbd..00000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes Gentoo-bug #641866
-
---- a/scripts/GNUmakefile
-+++ b/scripts/GNUmakefile
-@@ -6,5 +6,5 @@
- install:
- if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
-- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
-- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
-+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir bash-completion` ; \
-+ cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=completionsdir bash-completion`/gdal.sh; \
- fi
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
deleted file mode 100644
index 49824022b3b..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5c12d11614a325317ceaa7c0567070b3e4188275 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Mar 2019 12:43:59 +0100
-Subject: [PATCH] Add support for Poppler 0.75.0 (fixes #1388)
-
----
- gdal/frmts/pdf/pdfio.h | 5 ---
- gdal/frmts/pdf/pdfobject.cpp | 59 ++++++++----------------------------
- 2 files changed, 12 insertions(+), 52 deletions(-)
-
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index 7ae15c88aa3..ec13b8fe94c 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
- virtual void close() override;
-
- private:
-- /* getChars/hasGetChars added in poppler 0.15.0
-- * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
-- * This test will be wrong for poppler 0.15 or 0.16,
-- * but will still compile correctly.
-- */
- virtual GBool hasGetChars() override;
- virtual int getChars(int nChars, Guchar *buffer) override;
-
-diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
---- a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
- return oIter->second;
-
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-- Object o = m_poDict->lookupNF(((char*)pszKey));
-+ auto&& o(m_poDict->lookupNF(((char*)pszKey)));
- if (!o.isNull())
- {
- int nRefNum = 0;
-@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
- {
- nRefNum = o.getRefNum();
- nRefGen = o.getRefGen();
-- Object o2 = m_poDict->lookup((char*)pszKey);
-+ Object o2(m_poDict->lookup((char*)pszKey));
- if( !o2.isNull() )
- {
- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
- }
- else
- {
-- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+ GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
- poObj->SetRefNumAndGen(nRefNum, nRefGen);
- m_map[pszKey] = poObj;
- return poObj;
-@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
- return m_v[nIndex];
-
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-- Object o = m_poArray->getNF(nIndex);
-+ auto&& o(m_poArray->getNF(nIndex));
- if( !o.isNull() )
- {
- int nRefNum = 0;
-@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
- {
- nRefNum = o.getRefNum();
- nRefGen = o.getRefGen();
-- Object o2 = m_poArray->get(nIndex);
-+ Object o2(m_poArray->get(nIndex));
- if( !o2.isNull() )
- {
- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
- }
- else
- {
-- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+ GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
- poObj->SetRefNumAndGen(nRefNum, nRefGen);
- m_v[nIndex] = poObj;
- return poObj;
-@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength()
-
- char* GDALPDFStreamPoppler::GetBytes()
- {
-- /* fillGooString() available in poppler >= 0.16.0 */
--#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
- GooString* gstr = new GooString();
- m_poStream->fillGooString(gstr);
-
-@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes()
- char* pszContent = (char*) VSIMalloc(m_nLength + 1);
- if (pszContent)
- {
-- memcpy(pszContent, gstr->getCString(), m_nLength);
-+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-+ const char* srcStr = gstr->c_str();
-+#else
-+ const char* srcStr = gstr->getCString();
-+#endif
-+ memcpy(pszContent, srcStr, m_nLength);
- pszContent[m_nLength] = '\0';
- }
- delete gstr;
-@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes()
- delete gstr;
- return nullptr;
- }
--#else
-- int i;
-- int nLengthAlloc = 0;
-- char* pszContent = nullptr;
-- if( m_nLength >= 0 )
-- {
-- pszContent = (char*) VSIMalloc(m_nLength + 1);
-- if (!pszContent)
-- return nullptr;
-- nLengthAlloc = m_nLength;
-- }
-- m_poStream->reset();
-- for(i = 0; ; ++i )
-- {
-- int nVal = m_poStream->getChar();
-- if (nVal == EOF)
-- break;
-- if( i >= nLengthAlloc )
-- {
-- nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3;
-- char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1);
-- if( pszContentNew == nullptr )
-- {
-- CPLFree(pszContent);
-- m_nLength = 0;
-- return nullptr;
-- }
-- pszContent = pszContentNew;
-- }
-- pszContent[i] = (GByte)nVal;
-- }
-- m_nLength = i;
-- pszContent[i] = '\0';
-- return pszContent;
--#endif
- }
-
- #endif // HAVE_POPPLER
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
deleted file mode 100644
index f15e540932d..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8958528f9b5737581afa7249b0e16f2ff89d727e Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 21 Apr 2019 12:19:56 +0200
-Subject: [PATCH] PDF: add support for Poppler 0.76.0
-
----
- gdal/frmts/pdf/pdfsdk_headers.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
-index 41e48ae91d6..1f77429bf9b 100644
---- a/frmts/pdf/pdfsdk_headers.h
-+++ b/frmts/pdf/pdfsdk_headers.h
-@@ -55,7 +55,10 @@
- #else
- typedef unsigned char Guchar;
- #endif
-+
-+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 76)
- #include <goo/GooList.h>
-+#endif
-
- /* begin of poppler xpdf includes */
- #include <poppler/Object.h>
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
deleted file mode 100644
index 740856814f8..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 22 Oct 2019 13:11:57 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 15537ca7fd7..8f944c40d30 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
- virtual void drawChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
-- CharCode code, int nBytes, Unicode *u, int uLen) override
-+ CharCode code, int nBytes,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+ const
-+#endif
-+ Unicode *u, int uLen) override
- {
- if (bEnableText)
- SplashOutputDev::drawChar(state, x, y, dx, dy,
-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 29 Sep 2019 23:55:18 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 3d68f92abe8..b3db5374227 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
-
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
-- GBool interpolate, int *maskColors, GBool inlineImg) override
-+ GBool interpolate,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+ const
-+#endif
-+ int *maskColors,
-+ GBool inlineImg) override
- {
- if (bEnableBitmap)
- SplashOutputDev::drawImage(state, ref, str,
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
deleted file mode 100644
index f077f463238..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 13 Nov 2019 14:07:22 +0100
-Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 8f944c40d30..88017953de5 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- CPLMutexHolderD(&hGlobalParamsMutex);
- /* poppler global variable */
- if (globalParams == nullptr)
-+ {
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+ globalParams.reset(new GlobalParams());
-+#else
- globalParams = new GlobalParams();
-+#endif
-+ }
-
- globalParams->setPrintCommands(CPLTestBool(
- CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
deleted file mode 100644
index 74614e925f6..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Nov 2019 14:33:32 +0100
-Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
-
----
- gdal/frmts/pdf/pdfio.cpp | 3 +++
- gdal/frmts/pdf/pdfio.h | 7 ++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
-index 917e92330ae..c0b9dad93cb 100644
---- a/frmts/pdf/pdfio.cpp
-+++ b/frmts/pdf/pdfio.cpp
-@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
- /************************************************************************/
-
- StreamKind VSIPDFFileStream::getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+ const
-+#endif
- {
- return strFile;
- }
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index aa34ab7210d..23344d33f77 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
- virtual void setPos(setPos_offset_type pos, int dir = 0) override;
- virtual void moveStart(moveStart_delta_type delta) override;
-
-- virtual StreamKind getKind() override;
-+ virtual StreamKind getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+ const
-+#endif
-+ override;
-+
- virtual GooString *getFileName() override;
-
- virtual int getChar() override;
diff --git a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch b/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
deleted file mode 100644
index 9d104e60f60..00000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 7a2c9f9348e1bf6bd95033d0b4da09a243fd9e6d Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 8 Jul 2019 14:34:55 +0200
-Subject: [PATCH] Python bindings: add compatibility with SWIG 4.0 (based on
- patch by @perestoronin, fixes #1702)
-
----
- gdal/swig/include/gdal_array.i | 6 ++++++
- gdal/swig/include/python/typemaps_python.i | 9 ++++++++-
- gdal/swig/python/extensions/gdal_array_wrap.cpp | 15 ++++++++++++++-
- gdal/swig/python/extensions/gdal_wrap.cpp | 9 ++++++++-
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
-index c4f6f19b610..bf053eb2476 100644
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -899,12 +899,18 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray)
- }
-
- /* Keep a reference to the VirtualMem object */
-+%#if SWIGVERSION >= 0x040000
-+%#define obj0 swig_obj[0]
-+%#endif
- %#if NPY_API_VERSION >= 0x00000007
- PyArray_SetBaseObject(ar, obj0);
- %#else
- PyArray_BASE(ar) = obj0;
- %#endif
- Py_INCREF(obj0);
-+%#if SWIGVERSION >= 0x040000
-+%#undef obj0
-+%#endif
- Py_DECREF($result);
- $result = (PyObject*) ar;
- }
-diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
-index 5c9f36ab278..9266422e9c4 100644
---- a/swig/include/python/typemaps_python.i
-+++ b/swig/include/python/typemaps_python.i
-@@ -2104,7 +2104,14 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
- %#if PY_VERSION_HEX >= 0x02070000
- /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
- Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
-- if (PyBuffer_FillInfo(buf, obj0, *($1), *($2), *($4), PyBUF_ND)) {
-+
-+ if (PyBuffer_FillInfo(buf,
-+%#if SWIGVERSION >= 0x040000
-+ swig_obj[0],
-+%#else
-+ obj0,
-+%#endif
-+ *($1), *($2), *($4), PyBUF_ND)) {
- // error, handle
- }
- if( *($3) == GDT_Byte )
-diff --git a/swig/python/extensions/gdal_array_wrap.cpp b/swig/python/extensions/gdal_array_wrap.cpp
-index 807e12dd4a0..4435803e6d9 100644
---- a/swig/python/extensions/gdal_array_wrap.cpp
-+++ b/swig/python/extensions/gdal_array_wrap.cpp
-@@ -4598,7 +4598,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
- /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
- Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
-- if (PyBuffer_FillInfo(buf, obj0, *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+
-+ if (PyBuffer_FillInfo(buf,
-+ #if SWIGVERSION >= 0x040000
-+ swig_obj[0],
-+ #else
-+ obj0,
-+ #endif
-+ *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
- // error, handle
- }
- if( *(arg4) == GDT_Byte )
-@@ -5597,12 +5604,18 @@ SWIGINTERN PyObject *_wrap_VirtualMemGetArray(PyObject *SWIGUNUSEDPARM(self), Py
- }
-
- /* Keep a reference to the VirtualMem object */
-+#if SWIGVERSION >= 0x040000
-+#define obj0 swig_obj[0]
-+#endif
- #if NPY_API_VERSION >= 0x00000007
- PyArray_SetBaseObject(ar, obj0);
- #else
- PyArray_BASE(ar) = obj0;
- #endif
- Py_INCREF(obj0);
-+#if SWIGVERSION >= 0x040000
-+#undef obj0
-+#endif
- Py_DECREF(resultobj);
- resultobj = (PyObject*) ar;
- }
-diff --git a/swig/python/extensions/gdal_wrap.cpp b/swig/python/extensions/gdal_wrap.cpp
-index 37cb635339e..f2f014fd0b5 100644
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -15238,7 +15238,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
- /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
- Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
-- if (PyBuffer_FillInfo(buf, obj0, *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+
-+ if (PyBuffer_FillInfo(buf,
-+ #if SWIGVERSION >= 0x040000
-+ swig_obj[0],
-+ #else
-+ obj0,
-+ #endif
-+ *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
- // error, handle
- }
- if( *(arg4) == GDT_Byte )