rpms/ufraw/F-7 ufraw-0.11-cmserrorhandler.patch, NONE, 1.1 ufraw.spec, 1.19, 1.20

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2525

Modified Files:
	ufraw.spec 
Added Files:
	ufraw-0.11-cmserrorhandler.patch 
Log Message:
prevent crash in CMS error handler (#239147)
Resolves: #239147


ufraw-0.11-cmserrorhandler.patch:

--- NEW FILE ufraw-0.11-cmserrorhandler.patch ---
--- ufraw-0.11/ufraw_developer.c.cmserrorhandler	2007-02-08 22:31:50.000000000 +0100
+++ ufraw-0.11/ufraw_developer.c	2007-05-24 16:33:21.000000000 +0200
@@ -21,6 +21,17 @@
 #include "nikon_curve.h"
 #include "ufraw.h"
 
+int lcms_message(int ErrorCode, const char *ErrorText)
+{
+    /* Possible ErrorCode:
+     * LCMS_ERRC_WARNING        0x1000
+     * LCMS_ERRC_RECOVERABLE    0x2000
+     * LCMS_ERRC_ABORTED        0x3000 */
+    (void)ErrorCode;
+    ufraw_message(UFRAW_ERROR, "%s", ErrorText);
+    return 1; /* Tell lcms that we handled the error */
+}
+
 developer_data *developer_init()
 {
     int i;
@@ -44,7 +55,7 @@
     d->intent = -1;
     d->updateTransform = TRUE;
     d->colorTransform = NULL;
-    cmsSetErrorHandler((void *)ufraw_message);
+    cmsSetErrorHandler(lcms_message);
     return d;
 }
 


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-7/ufraw.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ufraw.spec	26 Apr 2007 13:37:06 -0000	1.19
+++ ufraw.spec	24 May 2007 14:46:03 -0000	1.20
@@ -14,7 +14,7 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.11
-Release: 6%{?dist}
+Release: 8%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://ufraw.sourceforge.net
@@ -46,6 +46,7 @@
 
 BuildRequires: automake libtool
 Patch1: ufraw-0.11-exiv2.patch
+Patch2: ufraw-0.11-cmserrorhandler.patch
 
 %description
 UFRaw is a tool for opening raw format images of digital cameras.
@@ -86,6 +87,7 @@
 %setup -q
 
 %patch1 -p1 -b .exiv2
+%patch2 -p1 -b .cmserrorhandler
 ./autogen.sh
 
 %build
@@ -146,6 +148,12 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Thu May 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.11-8
+- use correct patch
+
+* Thu May 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.11-7
+- prevent crash in CMS error handler (#239147)
+
 * Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
 - exiv2 patch (#237846)