Build error fix after applying GraphicsMagick 2.0.6

Change-Id: I66d9f0d078202d460ad8ea94161e8777d28903f6

diff --git a/magick/mm_util_magick.c b/magick/mm_util_magick.c
index 452005a..22a827f 100644 (file)
--- a/magick/mm_util_magick.c
+++ b/magick/mm_util_magick.c
@@ -37,6 +37,7 @@ typedef struct {
 } mm_util_enc_opt_t;
 
 static bool __mm_util_check_rotation(mm_util_rotate_type_e rotation);
+static void __mm_util_magick_fatal_error_handler(const ExceptionType excep, const char *reason, const char *message) MAGICK_FUNC_NORETURN;
 
 static void __mm_util_magick_log_method(const ExceptionType excep, const char *message)
 {
@@ -63,6 +64,16 @@ static void __mm_util_magick_error_handler(const ExceptionType excep, const char
                mm_util_warn("[GM][Ex:%3u][Rs:%s] %s", excep, reason, message);
 }
 
+static void __mm_util_magick_fatal_error_handler(const ExceptionType excep, const char *reason, const char *message)
+{
+       if (excep >= ErrorException)
+               mm_util_error("[GM][Ex:%3u][Rs:%s] %s", excep, reason, message);
+       else
+               mm_util_warn("[GM][Ex:%3u][Rs:%s] %s", excep, reason, message);
+
+       exit(1);
+}
+
 static void __mm_util_init(ExceptionInfo *exception)
 {
        InitializeMagick(NULL);
@@ -82,7 +93,7 @@ static void __mm_util_init(ExceptionInfo *exception)
 #endif
        SetLogMethod(__mm_util_magick_log_method);
        SetErrorHandler(__mm_util_magick_error_handler);
-       SetFatalErrorHandler(__mm_util_magick_error_handler);
+       SetFatalErrorHandler(__mm_util_magick_fatal_error_handler);
        SetWarningHandler(__mm_util_magick_error_handler);
 }
 

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 3252685..7aba819 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.2.4
+Version:    0.2.5
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0