Merge pull request #17 from Artomatix/FixPythonBindings

Get AIMG python extension compiling

Author: cherylart

bindings/python/AImg/AImg.py

@@ -96,5 +96,5 @@ def write(io_or_path, data, fileFormat, profileName, colourProfile, encodeOption
     if colourProfile is not None:
         colourProfileLen = len(colourProfile)
 
-    errCode, imgCapsule = native.write(fileFormat.val, data, stream, width, height, fmt.val, profileName, colourProfile, colourProfileLen, encodeOptionsTuple)
-    AImgExceptions.checkErrorCode(imgCapsule, errCode)
+    errCode, imgCapsule = native.write(fileFormat.val, data, stream, width, height, fmt.val, fmt.val, profileName, colourProfile, colourProfileLen, encodeOptionsTuple)
+    AImgExceptions.checkErrorCode(imgCapsule, errCode)

bindings/python/tests.py

@@ -774,7 +774,7 @@ int32_t AImgConvertFormat(void* src, void* dest, int32_t width, int32_t height,
     return AImgErrorCode::AIMG_SUCCESS;
 }
 
-bool AImgIsFormatSupported(int32_t fileFormat, int32_t outputFormat)
+int32_t AImgIsFormatSupported(int32_t fileFormat, int32_t outputFormat)
 {
     return loaders[fileFormat]->isFormatSupported(outputFormat);
 }
@@ -896,4 +896,4 @@ void AIDestroySimpleMemoryBufferCallbacks(ReadCallback readCallback, WriteCallba
 
     auto data = (SimpleMemoryCallbackData*)callbackData;
     delete data;
-}
+}

src_c/AIL.cpp

@@ -156,7 +156,7 @@ extern "C"
     EXPORT_FUNC void AIGetFormatDetails(int32_t format, int32_t* numChannels, int32_t* bytesPerChannel, int32_t* floatOrInt);
     EXPORT_FUNC int32_t AImgConvertFormat(void* src, void* dest, int32_t width, int32_t height, int32_t inFormat, int32_t outFormat);
 
-    EXPORT_FUNC bool AImgIsFormatSupported(int32_t fileFormat, int32_t outputFormat);
+    EXPORT_FUNC int32_t AImgIsFormatSupported(int32_t fileFormat, int32_t outputFormat);
 
     EXPORT_FUNC int32_t AImgGetWhatFormatWillBeWrittenForData(int32_t fileFormat, int32_t inputFormat, int32_t outputFormat);
 

src_c/AIL.h

@@ -266,11 +266,12 @@ static PyObject* pyail_write(PyObject* self, PyObject* args)
     PyObject* fileLikeObj;
     int width, height;
     int inputFormat;
+    int outputFormat;
     const char* profileName;
     PyArrayObject* colourProfileObj;
     int colourProfileLen;
     PyObject* encodingOptionsTuple;
-    if (!PyArg_ParseTuple(args, "iOOiiisOIO", &fileFormat, &sourceArrayObj, &fileLikeObj, &width, &height, &inputFormat, &profileName, &colourProfileObj, &colourProfileLen, &encodingOptionsTuple))
+    if (!PyArg_ParseTuple(args, "iOOiiiisOIO", &fileFormat, &sourceArrayObj, &fileLikeObj, &width, &height, &inputFormat, &outputFormat, &profileName, &colourProfileObj, &colourProfileLen, &encodingOptionsTuple))
         return NULL;
 
     PyAIL_callback_data* callbackData;
@@ -288,7 +289,7 @@ static PyObject* pyail_write(PyObject* self, PyObject* args)
 
     callbackData->threadState = PyEval_SaveThread();
 
-    int err = AImgWriteImage(wImg, PyArray_DATA(sourceArrayObj), width, height, inputFormat, profileName, colourProfile, colourProfileLen, pyail_WriteCallback, pyail_TellCallback, pyail_SeekCallback, callbackData, encodingOptions);
+    int err = AImgWriteImage(wImg, PyArray_DATA(sourceArrayObj), width, height, inputFormat, outputFormat, profileName, colourProfile, colourProfileLen, pyail_WriteCallback, pyail_TellCallback, pyail_SeekCallback, callbackData, encodingOptions);
     PyEval_RestoreThread(callbackData->threadState);
 
     pyail_destroyCallbackData(callbackData);