"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/PConv.cpp" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

PConv.cpp  (pymol-open-source-2.2.0)	:	PConv.cpp  (pymol-open-source-2.3.0)
skipping to change at line 282		skipping to change at line 282
UtilNCopy(ptr, strval.c_str(), size);		UtilNCopy(ptr, strval.c_str(), size);
}		}
return (ok);		return (ok);
}		}
int PConvPyIntToInt(PyObject * obj, int *ptr)		int PConvPyIntToInt(PyObject * obj, int *ptr)
{		{
int ok = true;		int ok = true;
if(!obj) {		if(!obj) {
ok = false;		ok = false;
} else if(!PyInt_Check(obj)) {		} else if(PyLong_Check(obj)) {
if(!PyLong_Check(obj)) {		*ptr = (int) PyLong_AsLongLong(obj);
ok = false;		} else if(PyInt_Check(obj)) {
} else {
*ptr = (int) PyLong_AsLongLong(obj);
}
} else {
*ptr = PyInt_AsLong(obj);		*ptr = PyInt_AsLong(obj);
		} else {
		ok = false;
}		}
return (ok);		return (ok);
}		}
int PConvPyFloatToFloat(PyObject * obj, float *ptr)		int PConvPyFloatToFloat(PyObject * obj, float *ptr)
{		{
int ok = true;		int ok = true;
if(!obj) {		if(!obj) {
ok = false;		ok = false;
} else if(!PyFloat_Check(obj)) {		} else if(!PyFloat_Check(obj)) {
skipping to change at line 334		skipping to change at line 332
/* == end == */		/* == end == */
int PConvPyObjectToFloat(PyObject * object, float *value)		int PConvPyObjectToFloat(PyObject * object, float *value)
{		{
int result = true;		int result = true;
PyObject *tmp;		PyObject *tmp;
if(!object)		if(!object)
result = false;		result = false;
else if(PyFloat_Check(object)) {		else if(PyFloat_Check(object)) {
(*value) = (float) PyFloat_AsDouble(object);		(*value) = (float) PyFloat_AsDouble(object);
} else if(PyInt_Check(object)) {
(*value) = (float) PyInt_AsLong(object);
} else if(PyLong_Check(object)) {		} else if(PyLong_Check(object)) {
(*value) = (float) PyLong_AsLongLong(object);		(*value) = (float) PyLong_AsLongLong(object);
		} else if(PyInt_Check(object)) {
		(*value) = (float) PyInt_AsLong(object);
} else {		} else {
tmp = PyNumber_Float(object);		tmp = PyNumber_Float(object);
if(tmp) {		if(tmp) {
(*value) = (float) PyFloat_AsDouble(tmp);		(*value) = (float) PyFloat_AsDouble(tmp);
Py_DECREF(tmp);		Py_DECREF(tmp);
} else		} else
result = false;		result = false;
}		}
return (result);		return (result);
}		}
int PConvPyObjectToInt(PyObject * object, int *value)		int PConvPyObjectToInt(PyObject * object, int *value)
{		{
int result = true;		int result = true;
PyObject *tmp;		PyObject *tmp;
if(!object)		if(!object) {
result = false;		result = false;
else if(PyInt_Check(object)) {
(*value) = (int) PyInt_AsLong(object);
} else if(PyLong_Check(object)) {		} else if(PyLong_Check(object)) {
(*value) = (int) PyLong_AsLongLong(object);		(*value) = (int) PyLong_AsLongLong(object);
		} else if(PyInt_Check(object)) {
		(*value) = (int) PyInt_AsLong(object);
} else {		} else {
tmp = PyNumber_Int(object);		tmp = PyNumber_Int(object);
if(tmp) {		if(tmp) {
(*value) = (int) PyInt_AsLong(tmp);		(*value) = (int) PyInt_AsLong(tmp);
Py_DECREF(tmp);		Py_DECREF(tmp);
} else		} else
result = false;		result = false;
}		}
return (result);		return (result);
}		}
End of changes. 7 change blocks.
12 lines changed or deleted		10 lines changed or added

---