support windows

Author: zeng-qinghui

nvjpeg-python.cpp

@@ -8,7 +8,7 @@
 #include <structmember.h>
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
-#include <JpegCoder.hpp>
+#include "JpegCoder.hpp"
 
 typedef struct
 {
@@ -128,8 +128,13 @@ static PyObject* NvJpeg_read(NvJpeg* Self, PyObject* Argvs)
         PyErr_SetString(PyExc_ValueError, "Parse the argument FAILED! You should pass jpeg file path string!");
         return NULL;
     }
-
+    #ifdef _MSC_VER
+    FILE* fp;
+    fopen_s(&fp, (const char*)jpegFile, "rb");
+    #else
     FILE* fp = fopen((const char*)jpegFile, "rb");
+    #endif
+
     if (fp == NULL){
         PyErr_Format(PyExc_IOError, "Cannot open file \"%s\"", jpegFile);
         return NULL;
@@ -178,7 +183,13 @@ static PyObject* NvJpeg_write(NvJpeg* Self, PyObject* Argvs)
         return NULL;
     }
 
+    #ifdef _MSC_VER
+    FILE* fp;
+    fopen_s(&fp, (const char*)jpegFile, "wb");
+    #else
     FILE* fp = fopen((const char*)jpegFile, "wb");
+    #endif
+    
     if(fp == NULL){
         PyErr_Format(PyExc_IOError, "Cannot open file \"%s\"", jpegFile);
         return NULL;
@@ -217,12 +228,12 @@ static PyMethodDef NvJpeg_MethodMembers[] =
 
 static PyTypeObject NvJpeg_ClassInfo =
 {
-        PyVarObject_HEAD_INIT(NULL, 0)
+        .ob_base = PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name      = "nvjpeg.NvJpeg",
         .tp_basicsize = sizeof(NvJpeg),
         .tp_itemsize = 0,
         .tp_dealloc   = NvJpeg_Destruct,
-        .tp_print   = NULL,
+        // .tp_print   = NULL,
         .tp_getattr = NULL,
         .tp_setattr = NULL,
         .tp_as_async = NULL,

setup.py

@@ -33,8 +33,21 @@
         extension_nvjpeg = Extension('nvjpeg', 
             ['nvjpeg-python.cpp', 'src/x86/JpegCoder.cpp'], 
             ['include', numpy.get_include()], 
-            [('JPEGCODER_ARCH', 'x86')]
+            [('JPEGCODER_ARCH', 'x86')],
         )
+elif platform.system() == 'Windows':
+    cuda_include = '%s\\include' % (os.environ['CUDA_PATH'],)
+    if platform.machine().endswith('64'):
+        cuda_lib = '%s\\lib\\x64' % (os.environ['CUDA_PATH'],)
+    else:
+        cuda_lib = '%s\\lib\\Win32' % (os.environ['CUDA_PATH'],)
+    extension_nvjpeg = Extension('nvjpeg', 
+        ['nvjpeg-python.cpp', 'src\\x86\\JpegCoder.cpp'], 
+        ['include', numpy.get_include(), cuda_include], 
+        [('JPEGCODER_ARCH', 'x86')],
+        extra_compile_args=['/std:c++latest'],
+        library_dirs=[cuda_lib],
+    )
 
 
 setup(name='pynvjpeg',
@@ -75,5 +88,5 @@
         'Source': 'https://github.com/UsingNet/nvjpeg-python',
         'Tracker': 'https://github.com/UsingNet/nvjpeg-python/issues',
     },
-    install_requires=['numpy>=1.17', 'wheel>=0.36.2']
+    install_requires=['numpy>=1.17']
 )

src/x86/JpegCoder.cpp

@@ -25,9 +25,9 @@ JpegCoderImage::JpegCoderImage(size_t width, size_t height, short nChannel, Jpeg
     nvjpegImage_t *img = (nvjpegImage_t*)malloc(sizeof(nvjpegImage_t));
     for(int i = 0;i<NVJPEG_MAX_COMPONENT;i++){
         img->channel[i] = pBuffer + (width*height*i);
-        img->pitch[i] = width;
+        img->pitch[i] = (unsigned int)width;
     }
-    img->pitch[0] = width*3;
+    img->pitch[0] = (unsigned int)width*3;
 
     this->img = img;
     this->height = height;
@@ -116,7 +116,7 @@ JpegCoderBytes* JpegCoder::encode(JpegCoderImage* img, int quality){
     nvjpegEncoderParamsSetOptimizedHuffman(nv_enc_params, 1, NULL);
     nvjpegEncoderParamsSetSamplingFactors(nv_enc_params, ChromaSubsampling_Covert_JpegCoderToNvJpeg(img->subsampling), NULL);
 
-    int nReturnCode = nvjpegEncodeImage(nv_handle, nv_enc_state, nv_enc_params, (nvjpegImage_t*)(img->img), NVJPEG_INPUT_BGRI, img->width, img->height, NULL);
+    int nReturnCode = nvjpegEncodeImage(nv_handle, nv_enc_state, nv_enc_params, (nvjpegImage_t*)(img->img), NVJPEG_INPUT_BGRI, (int)img->width, (int)img->height, NULL);
     if (NVJPEG_STATUS_SUCCESS != nReturnCode){
         throw JpegCoderError(nReturnCode, "NvJpeg Encoder Error");
     }

tests/test.py

@@ -6,12 +6,11 @@
 import cv2
 import glob
 
-for lib in glob.glob(os.path.join(os.path.dirname(__file__), "../build/lib.*")):
+for lib in glob.glob(os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/lib.*"))):
     sys.path.append(lib)
 
 from nvjpeg import NvJpeg 
 
-
 nj = NvJpeg()
 image_file = os.path.join(os.path.dirname(__file__), "test-image", "test.jpg")