From 4620eede0225d56161a9fadbb43dbcee3c705d7b Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Sun, 23 Mar 2014 14:15:52 +0100 Subject: [PATCH] Include xbob.blitz C-API version --- xbob/io/version.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/xbob/io/version.cpp b/xbob/io/version.cpp index 9a6f6ec..59a2e86 100644 --- a/xbob/io/version.cpp +++ b/xbob/io/version.cpp @@ -333,6 +333,13 @@ static PyObject* numpy_version() { "api", BOOST_PP_STRINGIZE(NPY_API_VERSION)); } +/** + * xbob.blitz c/c++ api version + */ +static PyObject* xbob_blitz_version() { + return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(XBOB_BLITZ_API_VERSION)); +} + static PyObject* build_version_dictionary() { PyObject* retval = PyDict_New(); @@ -340,31 +347,22 @@ static PyObject* build_version_dictionary() { auto retval_ = make_safe(retval); if (!dict_steal(retval, "Bob", bob_version())) return 0; - if (!dict_steal(retval, "HDF5", hdf5_version())) return 0; - if (!dict_steal(retval, "FFmpeg", ffmpeg_version())) return 0; - if (!dict_steal(retval, "libjpeg", libjpeg_version())) return 0; - if (!dict_set(retval, "libnetpbm", "Unknown version")) return 0; - if (!dict_steal(retval, "libpng", libpng_version())) return 0; - if (!dict_steal(retval, "libtiff", libtiff_version())) return 0; - if (!dict_steal(retval, "giflib", giflib_version())) return 0; - if (!dict_steal(retval, "MatIO", matio_version())) return 0; - if (!dict_steal(retval, "Boost", boost_version())) return 0; - if (!dict_steal(retval, "Compiler", compiler_version())) return 0; - if (!dict_steal(retval, "Python", python_version())) return 0; - if (!dict_steal(retval, "NumPy", numpy_version())) return 0; + if (!dict_set(retval, "Blitz++", BZ_VERSION)) return 0; + if (!dict_steal(retval, "xbob.blitz", xbob_blitz_version())) return 0; + Py_INCREF(retval); Py_INCREF(retval); return retval; } -- GitLab