comparison PyTypeInterface.h @ 66:5664fe298af2

Update to Python 2.7 and clean up the build (avoid using deprecated NumPy API, fix compiler warnings)

+/* -*- c-basic-offset: 8 indent-tabs-mode: t -*- */
 /*
 
  * Vampy : This plugin is a wrapper around the Vamp plugin API.
  * It allows for writing Vamp plugins in Python.
 

 #define _PY_TYPE_INTERFACE_H_
 #include <Python.h>
 #ifdef HAVE_NUMPY
 #define PY_ARRAY_UNIQUE_SYMBOL VAMPY_ARRAY_API
 #define NO_IMPORT_ARRAY
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include "numpy/arrayobject.h"
 #endif
 #include "PyExtensionModule.h"
 #include <vector>
 #include <queue>

 
 	}
 
 	/// Convert DTYPE type 1D NumpyArray to std::vector<RET>
 	template<typename RET, typename DTYPE>
-	std::vector<RET> PyArray_Convert(char* raw_data_ptr, long length, size_t strides) const
+	std::vector<RET> PyArray_Convert(void* raw_data_ptr, long length, size_t strides) const
 	{
 		std::vector<RET> rValue;
 		
 		/// check if the array is continuous, if not use strides info
 		if (sizeof(DTYPE)!=strides) {

 	
 	for (size_t i=0; i < channels; ++i) {
 		PyObject *pyChannelArray = 
 			//args: (dimensions, size in each dim, type kind, pointer to continuous array)
 			PyArray_SimpleNewFromData(1, ndims, typenum, (void*) inputBuffers[i]);
-		// make it read-only: set all flags to false except NPY_C_CONTIGUOUS 
-		((PyArrayObject*)pyChannelArray)->flags = NPY_C_CONTIGUOUS;
+		// make it read-only: set all flags to false except NPY_C_CONTIGUOUS
+		//!!! what about NPY_ARRAY_OWNDATA?
+		PyArray_CLEARFLAGS((PyArrayObject *)pyChannelArray, 0xff);
+		PyArray_ENABLEFLAGS((PyArrayObject *)pyChannelArray, NPY_ARRAY_C_CONTIGUOUS);
 		pyChannelListArray[i] = pyChannelArray;
 	}
 	return pyChannelList;
 }
 #endif