"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/PConv.h" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

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.h  (pymol-v1.8.6.0.tar.bz2)	:	PConv.h  (pymol-v2.1.0.tar.bz2)
skipping to change at line 104		skipping to change at line 104
int PConvAttrToPtr(PyObject * obj, const char *name, void **cobj);		int PConvAttrToPtr(PyObject * obj, const char *name, void **cobj);
int PConvCObjectToPtr(PyObject * obj, void **ptr);		int PConvCObjectToPtr(PyObject * obj, void **ptr);
int PConvPyListToStrVLAList(PyObject * obj, char **vla, int *n_str);		int PConvPyListToStrVLAList(PyObject * obj, char **vla, int *n_str);
int PConvPyListToStringVLA(PyObject * obj, char **vla_ptr);		int PConvPyListToStringVLA(PyObject * obj, char **vla_ptr);
#define PConvPyListToIntVLA(obj, f) PConvPyListToIntArrayImpl(obj, f, true)		#define PConvPyListToIntVLA(obj, f) PConvPyListToIntArrayImpl(obj, f, true)
int PConvPyStrToStr(PyObject * obj, char *ptr, int l);		int PConvPyStrToStr(PyObject * obj, char *ptr, int l);
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
int PConvPyStrToStrPtr(PyObject * obj, char **ptr);		int PConvPyStrToStrPtr(PyObject * obj, const char **ptr);
#endif		#endif
int PConvPyStrToLexRef(PyObject * obj, OVLexicon * lex, int *lex_ref);		int PConvPyStrToLexRef(PyObject * obj, OVLexicon * lex, int *lex_ref);
int PConvPyFloatToFloat(PyObject * obj, float *ptr);		int PConvPyFloatToFloat(PyObject * obj, float *ptr);
int PConvPyIntToChar(PyObject * obj, char *ptr);		int PConvPyIntToChar(PyObject * obj, char *ptr);
int PConvPyIntToInt(PyObject * obj, int *ptr);		int PConvPyIntToInt(PyObject * obj, int *ptr);
int PConvPyBoolToInt(PyObject * obj, int *ptr);		int PConvPyBoolToInt(PyObject * obj, int *ptr);
int PConvPyListToLabPosVLA(PyObject * obj, LabPosType ** vla_ptr);		int PConvPyListToLabPosVLA(PyObject * obj, LabPosType ** vla_ptr);
/* Jenarix conventions -- returns before args */		/* Jenarix conventions -- returns before args */
skipping to change at line 211		skipping to change at line 211
inline PyObject * PConvToPyObject(double v) {		inline PyObject * PConvToPyObject(double v) {
return PyFloat_FromDouble(v);		return PyFloat_FromDouble(v);
}		}
inline PyObject * PConvToPyObject(const std::string &v) {		inline PyObject * PConvToPyObject(const std::string &v) {
return PyString_FromString(v.c_str());		return PyString_FromString(v.c_str());
}		}
inline PyObject * PConvToPyObject(const char * v) {		inline PyObject * PConvToPyObject(const char * v) {
		#ifndef _PYMOL_NOPY
		if (!v) {
		Py_RETURN_NONE;
		}
		#endif
return PyString_FromString(v);		return PyString_FromString(v);
}		}
inline PyObject * PConvToPyObject(const float * v, int n) {		inline PyObject * PConvToPyObject(const float * v, int n) {
return PConvFloatArrayToPyList((float*)v, n);		return PConvFloatArrayToPyList((float*)v, n);
}		}
template <class T>		template <class T>
PyObject * PConvToPyObject(const std::vector<T> &v) {		PyObject * PConvToPyObject(const std::vector<T> &v) {
int n = v.size();		int n = v.size();
End of changes. 2 change blocks.
1 lines changed or deleted		6 lines changed or added

---