report lcms2 errors

This commit is contained in:
Nils Philippsen 2014-06-03 16:30:51 +02:00
parent fd493c70cd
commit 99c8ff9489
2 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,38 @@
From affda75b7d868350d7ef9e7a67367826fb3e950d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 4 Sep 2013 17:13:49 +0200
Subject: [PATCH] Report errors with LCMS version 2.x.
---
dcraw.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dcraw.c b/dcraw.c
index 6f8dbbe..d80db64 100644
--- a/dcraw.c
+++ b/dcraw.c
@@ -8902,6 +8902,13 @@ notraw:
}
#ifndef NO_LCMS
+static void lcms2_error_show_handler (cmsContext ContextID,
+ cmsUInt32Number ErrorCode,
+ const char *Text)
+{
+ fprintf (stderr, "lcms2: Error #%d; %s\n", ErrorCode, Text);
+}
+
void CLASS apply_profile (const char *input, const char *output)
{
char *prof;
@@ -8910,6 +8917,7 @@ void CLASS apply_profile (const char *input, const char *output)
FILE *fp;
unsigned size;
+ cmsSetLogErrorHandler (lcms2_error_show_handler);
if (strcmp (input, "embed"))
hInProfile = cmsOpenProfileFromFile (input, "r");
else if (profile_length) {
--
1.9.0

View File

@ -7,6 +7,7 @@ License: GPLv2+
URL: http://cybercom.net/~dcoffin/dcraw URL: http://cybercom.net/~dcoffin/dcraw
Source0: http://cybercom.net/~dcoffin/dcraw/archive/dcraw-%{version}.tar.gz Source0: http://cybercom.net/~dcoffin/dcraw/archive/dcraw-%{version}.tar.gz
Patch0: dcraw-9.19-CVE-2013-1438.patch Patch0: dcraw-9.19-CVE-2013-1438.patch
Patch1: dcraw-9.21-lcms2-error-reporting.patch
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: lcms2-devel BuildRequires: lcms2-devel
@ -20,6 +21,7 @@ downloaded from digital cameras.
%prep %prep
%setup -q -n dcraw %setup -q -n dcraw
%patch0 -p1 -b .CVE-2013-1438 %patch0 -p1 -b .CVE-2013-1438
%patch1 -p1 -b .lcms2-error-reporting
%build %build
gcc %optflags \ gcc %optflags \
@ -70,6 +72,9 @@ rm -rf %buildroot
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Tue May 06 2014 Nils Philippsen <nils@redhat.com> - 9.21-1
- report lcms2 errors
* Mon May 05 2014 Nils Philippsen <nils@redhat.com> - 9.21-1 * Mon May 05 2014 Nils Philippsen <nils@redhat.com> - 9.21-1
- version 9.21 - version 9.21