voyageur    14/10/28 09:14:56

  Added:                geeqie-1.2-fix-lcms2-integration.patch
  Log:
  Fix segfault at startup, patch from upstream, reported by Tomasz Golinski 
<[email protected]> in bug #527082
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
C74525F2)

Revision  Changes    Path
1.1                  
media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch?rev=1.1&content-type=text/plain

Index: geeqie-1.2-fix-lcms2-integration.patch
===================================================================
>From a1afabd3ce740872a857234b91eeb64fcf239f6a Mon Sep 17 00:00:00 2001
From: Klaus Ethgen <[email protected]>
Date: Sat, 27 Sep 2014 12:07:10 +0100
Subject: [PATCH] Fix lcms2 integration

Thanks Michael Schwendt <[email protected]> for the bug reporting and
the patch.
---
 src/color-man.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/color-man.c b/src/color-man.c
index 7788c7a..e4f1bab 100644
--- a/src/color-man.c
+++ b/src/color-man.c
@@ -432,10 +432,12 @@ static gchar 
*color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p
                        if (profile)
                                {
 #ifdef HAVE_LCMS2
-                               cmsUInt8Number profileID[17];
-                               profileID[16] = '\0';
-                               cmsGetHeaderProfileID(profile, profileID);
-                               return g_strdup((gchar *) profileID);
+                               cmsUInt32Number r;
+                               char buffer[20];
+                               buffer[0] = '\0';
+                               r = cmsGetProfileInfoASCII(profile, 
cmsInfoDescription, "en", "US", &buffer, 20);
+                               buffer[19] = '\0'; /* Just to be sure */
+                               return g_strdup(buffer);
 #else
                                return g_strdup(cmsTakeProductName(profile));
 #endif
-- 
1.7.1





Reply via email to