Mercurial > hg > vampy

comparison PyFeature.cpp @ 66:5664fe298af2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to Python 2.7 and clean up the build (avoid using deprecated NumPy API, fix compiler warnings)
author Chris Cannam
date Mon, 17 Nov 2014 09:37:59 +0000
parents 27bab3a16c9a
children
comparison
equal deleted inserted replaced
65:0df94e3f0fdb 66:5664fe298af2
53 /// accept keyword arguments: 53 /// accept keyword arguments:
54 /// e.g. Feature(values = theOutputArray) 54 /// e.g. Feature(values = theOutputArray)
55 if (!kw || !PyDict_Size(kw)) return (PyObject *) self; 55 if (!kw || !PyDict_Size(kw)) return (PyObject *) self;
56 PyDict_Merge(self->dict,kw,0); 56 PyDict_Merge(self->dict,kw,0);
57 57
58 static char *kwlist[] = {"timestamp", "hasTimestamp", "duration", "hasDuration", 0}; 58 static const char *kwlist[] = {"timestamp", "hasTimestamp", "duration", "hasDuration", 0};
59 59
60 int i = 0; 60 int i = 0;
61 while (kwlist[i]) { 61 while (kwlist[i]) {
62 char* name = kwlist[i]; 62 const char* name = kwlist[i];
63 char* attr = kwlist[++i]; 63 const char* attr = kwlist[++i];
64 i++; 64 i++;
65 PyObject *key = PyString_FromString(name); 65 PyObject *key = PyString_FromString(name);
66 if (!key) break; 66 if (!key) break;
67 if (PyDict_Contains(kw,key)) { 67 if (PyDict_Contains(kw,key)) {
68 if (PyDict_SetItem(self->dict,PyString_FromString(attr),Py_True) != 0) 68 if (PyDict_SetItem(self->dict,PyString_FromString(attr),Py_True) != 0)