Field.cpp (pymol-open-source-2.2.0) | : | Field.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 180 | skipping to change at line 180 | |||
OOFreeP(I); | OOFreeP(I); | |||
} | } | |||
I = NULL; | I = NULL; | |||
} | } | |||
return I; | return I; | |||
} | } | |||
CField *FieldNewFromPyList(PyMOLGlobals * G, PyObject * list) | CField *FieldNewFromPyList(PyMOLGlobals * G, PyObject * list) | |||
{ | { | |||
int ok = true; | int ok = true; | |||
int ll; | ||||
int *I_dim = NULL; | int *I_dim = NULL; | |||
int *I_stride = NULL; | int *I_stride = NULL; | |||
OOAlloc(G, CField); | OOAlloc(G, CField); | |||
if(ok) | if(ok) | |||
ok = (list != NULL); | ok = (list != NULL); | |||
if(ok) | if(ok) | |||
ok = PyList_Check(list); | ok = PyList_Check(list); | |||
if(ok) | if(ok) | |||
ll = PyList_Size(list); | ||||
if(ok) | ||||
ok = PConvPyIntToInt(PyList_GetItem(list, 0), &I->type); | ok = PConvPyIntToInt(PyList_GetItem(list, 0), &I->type); | |||
if(ok) | if(ok) | |||
ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->n_dim); | ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->n_dim); | |||
if(ok) | if(ok) | |||
ok = PConvPyIntToInt(PyList_GetItem(list, 2), (int *) &I->base_size); | ok = PConvPyIntToInt(PyList_GetItem(list, 2), (int *) &I->base_size); | |||
if(ok) | if(ok) | |||
ok = PConvPyIntToInt(PyList_GetItem(list, 3), (int *) &I->size); | ok = PConvPyIntToInt(PyList_GetItem(list, 3), (int *) &I->size); | |||
if(ok) | if(ok) | |||
ok = PConvPyListToIntArray(PyList_GetItem(list, 4), &I_dim); | ok = PConvPyListToIntArray(PyList_GetItem(list, 4), &I_dim); | |||
if(ok) | if(ok) | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 0 lines changed or added |