Merge pull request #4 from saulzar/master

Fix this <class 'nvjpeg.NvJpeg'> returned NULL without setting an error

Author: zeng-qinghui

nvjpeg-python.c

@@ -45,11 +45,13 @@ NvJpegPythonHandle* NvJpegPython_startUpEnv(){
 }
 
 void NvJpegPython_cleanUpEnv(){
-    nvjpegJpegStateDestroy((__gllobal_NvJpegPython)->nv_statue);
-    nvjpegEncoderStateDestroy((__gllobal_NvJpegPython)->nv_enc_state);
-    nvjpegDestroy((__gllobal_NvJpegPython)->nv_handle);
-    free(__gllobal_NvJpegPython);
-    __gllobal_NvJpegPython = NULL;
+    if(__gllobal_NvJpegPython != NULL) {
+      nvjpegJpegStateDestroy((__gllobal_NvJpegPython)->nv_statue);
+      nvjpegEncoderStateDestroy((__gllobal_NvJpegPython)->nv_enc_state);
+      nvjpegDestroy((__gllobal_NvJpegPython)->nv_handle);
+      free(__gllobal_NvJpegPython);
+      __gllobal_NvJpegPython = NULL;
+    }
 }
 
 NvJpegPythonImage* NvJpegPython_createImage(int width, int height, int nComponent, nvjpegChromaSubsampling_t subsampling){
@@ -252,12 +254,12 @@ static PyMemberDef NvJpeg_DataMembers[] =
         {NULL, 0, 0, 0, NULL}
 };
 
-
-static void NvJpeg_init(NvJpeg* Self, PyObject* pArgs)
-{
-    Self->m_handle = (long long)(NvJpegPython_startUpEnv());
+int NvJpeg_init(NvJpeg *self, PyObject *args, PyObject *kwds) {
+  self->m_handle = (long long)(NvJpegPython_startUpEnv());
+  return 0;
 }
 
+
 static void NvJpeg_Destruct(NvJpeg* Self)
 {
     Py_TYPE(Self)->tp_free((PyObject*)Self);
@@ -435,25 +437,22 @@ static PyMethodDef NvJpeg_MethodMembers[] =
 
 static PyTypeObject NvJpeg_ClassInfo =
 {
-        PyVarObject_HEAD_INIT(NULL, 0)"nvjpeg.NvJpeg",
-        sizeof(NvJpeg),
-        0,
-        (destructor)NvJpeg_Destruct,
-        NULL,NULL,NULL,NULL,
-        (reprfunc)NvJpeg_Repr,
-        NULL,NULL,NULL,NULL,NULL,
-        (reprfunc)NvJpeg_Str,
-        NULL,NULL,NULL,
-        Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-        "NvJpeg Python Objects---Extensioned by nvjpeg",
-        NULL,NULL,NULL,0,NULL,NULL,
-        NvJpeg_MethodMembers,
-        NvJpeg_DataMembers,
-        NULL,NULL,NULL,NULL,NULL,0,
-        (initproc)NvJpeg_init,
-        NULL,
+        PyVarObject_HEAD_INIT(NULL, 0)
+        .tp_name      = "nvjpeg.NvJpeg",
+        .tp_new = PyType_GenericNew,
+        .tp_basicsize = sizeof(NvJpeg),
+        .tp_dealloc   = NvJpeg_Destruct,
+        .tp_repr      = NvJpeg_Repr,
+        .tp_str       = NvJpeg_Str,
+        .tp_flags     = Py_TPFLAGS_DEFAULT,
+        .tp_doc       = "NvJpeg Python Objects---Extensioned by nvjpeg",
+        .tp_methods   = NvJpeg_MethodMembers,
+        .tp_members   = NvJpeg_DataMembers,
+        .tp_init      = NvJpeg_init,
+        .tp_itemsize = 0,
 };
 
+
 void NvJpeg_module_destroy(void *_){
     NvJpegPython_cleanUpEnv();
 }
@@ -471,18 +470,23 @@ static PyModuleDef ModuleInfo =
 PyMODINIT_FUNC
 PyInit_nvjpeg(void) {
     PyObject * pReturn = NULL;
-    NvJpeg_ClassInfo.tp_new = PyType_GenericNew;
 
-
-    if(PyType_Ready(&NvJpeg_ClassInfo) < 0)
+    if(PyType_Ready(&NvJpeg_ClassInfo) < 0) 
         return NULL;
 
     pReturn = PyModule_Create(&ModuleInfo);
     if(pReturn == NULL)
         return NULL;
 
     Py_INCREF(&ModuleInfo);
-    PyModule_AddObject(pReturn, "NvJpeg", (PyObject*)&NvJpeg_ClassInfo);
+
+    Py_INCREF(&NvJpeg_ClassInfo);
+    if (PyModule_AddObject(pReturn, "NvJpeg", (PyObject*)&NvJpeg_ClassInfo) < 0) {
+        Py_DECREF(&NvJpeg_ClassInfo);
+        Py_DECREF(pReturn);
+        return NULL;
+    }
+
     import_array();
     return pReturn;
 }

tests/test-with-multiprocessing.py

@@ -10,7 +10,8 @@
 for lib in glob.glob(os.path.join(os.path.dirname(__file__), "../build/lib.*")):
     sys.path.append(lib)
 
-from nvjpeg import NvJpeg 
+from nvjpeg import NvJpeg
+nj = NvJpeg()
 
 
 image_dir = os.path.join(os.path.dirname(__file__), "test-image")