Fix build error due to upgrade to libjxl 0.11.1

Change-Id: I106f4f3b1a5cf2f9c2a7db41cf05d97fc6e766d9

diff --git a/jxl/mm_util_jxl.c b/jxl/mm_util_jxl.c
index ccda906eba72e29ccbeb51221e79702b7ee2bfda..8a1dba3e03e981c5803c87c0ae1dad4bf8e81c71 100644 (file)
--- a/jxl/mm_util_jxl.c
+++ b/jxl/mm_util_jxl.c
@@ -48,7 +48,6 @@ static int __convert_dec_error(JxlDecoderStatus status)
                break;
        case JXL_DEC_NEED_MORE_INPUT:
        case JXL_DEC_NEED_PREVIEW_OUT_BUFFER:
-       case JXL_DEC_NEED_DC_OUT_BUFFER:
        case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
                err = MM_UTIL_ERROR_INVALID_PARAMETER;
                break;
@@ -66,27 +65,26 @@ static int __convert_dec_error(JxlDecoderStatus status)
        return err;
 }
 
-static int __convert_enc_error(JxlEncoderStatus status)
+static int __convert_enc_error(JxlEncoderError error)
 {
        int err = MM_UTIL_ERROR_NONE;
 
-       switch (status) {
-       case JXL_ENC_SUCCESS:
+       switch (error) {
+       case JXL_ENC_ERR_OK:
                err = MM_UTIL_ERROR_NONE;
                break;
-       case JXL_ENC_NEED_MORE_OUTPUT:
+       case JXL_ENC_ERR_OOM:
                err = MM_UTIL_ERROR_OUT_OF_MEMORY;
                break;
-       case JXL_ENC_NOT_SUPPORTED:
+       case JXL_ENC_ERR_NOT_SUPPORTED:
                err = MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT;
                break;
-       case JXL_ENC_ERROR:
        default:
                err = MM_UTIL_ERROR_INVALID_OPERATION;
                break;
        }
 
-       mm_util_warn("convert err(%d) from status(%d)", err, status);
+       mm_util_warn("convert err(%d) from error(%d)", err, error);
 
        return err;
 }
@@ -297,6 +295,7 @@ static int __mm_util_encode_jpegxl(mm_util_image_h decoded_image, mm_util_enc_op
 {
        int ret = MM_UTIL_ERROR_NONE;
        JxlEncoderStatus status = JXL_ENC_ERROR;
+       JxlEncoderError jxl_enc_err = JXL_ENC_ERR_OK;
        JxlEncoder *jxl_enc = NULL;
        void *jxl_thread = NULL;
        JxlPixelFormat jxl_format;
@@ -420,8 +419,7 @@ static int __mm_util_encode_jpegxl(mm_util_image_h decoded_image, mm_util_enc_op
 
 Exit:
 
-       if (status != JXL_ENC_SUCCESS)
-               mm_util_error("JxlEncoderGetError: %d", JxlEncoderGetError(jxl_enc));
+       jxl_enc_err = JxlEncoderGetError(jxl_enc);
 
        g_free(compressed);
        JxlThreadParallelRunnerDestroy(jxl_thread);
@@ -429,7 +427,7 @@ Exit:
 
        mm_util_fleave();
 
-       return __convert_enc_error(status);
+       return __convert_enc_error(jxl_enc_err);
 }
 
 int mm_util_decode_jxl_from_file(const char *path, mm_util_color_format_e format, mm_util_image_h *decoded_image)

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index cafd02b48feb466e335df099a8deb46472a34a0b..047ef09d5f63ba44e08600fdd3254238f782411e 100644 (file)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -1,6 +1,6 @@
 Name:       libmm-utility
 Summary:    Multimedia Framework Utility Library
-Version:    0.4.27
+Version:    0.4.28
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0