From 3f77d912bab568d0268c5af613641c88a0ab0351 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 21 Mar 2014 08:28:16 +0100 Subject: Fix _ICC_PROFILE support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/blueshift_iccprofile.c | 6 +++--- src/icc.py | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/blueshift_iccprofile.c b/src/blueshift_iccprofile.c index cc58ac2..ef04701 100644 --- a/src/blueshift_iccprofile.c +++ b/src/blueshift_iccprofile.c @@ -127,17 +127,17 @@ int main(int argc, char** argv) /* Check property name pattern */ - if (!strcmp(name, "_icc_profile")) + if (!strcasecmp(name, "_icc_profile")) monitor = 0; else if (strcasestr(name, "_icc_profile_") == name) { name += strlen("_icc_profile_"); monitor = 0; - if (*name) + if (*name == '\0') continue; while (*name) { - char c = *name; + char c = *name++; if (('0' <= c) && (c <= '9')) monitor = monitor * 10 - (c & 15); else diff --git a/src/icc.py b/src/icc.py index df77a52..e08dfa7 100644 --- a/src/icc.py +++ b/src/icc.py @@ -19,6 +19,10 @@ from subprocess import Popen, PIPE from curve import * +# /usr/libexec +LIBEXECDIR = 'bin' + + def load_icc(pathname): ''' @@ -58,9 +62,9 @@ def get_current_icc_raw(): for line in lines: if len(line) == 0: continue - (s, m, p) = lines.split(': ') + (s, m, p) = line.split(': ') p = bytes([int(p[i : i + 2], 16) for i in range(0, len(p), 2)]) - rc.append((s, m, p)) + rc.append((int(s), int(m), p)) return rc -- cgit v1.2.3-70-g09d2