Mercurial > emacs
comparison src/nsterm.m @ 104400:ed5d844496e7 CEDET_BASE
(ns_get_color): fix typo in last change
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Fri, 21 Aug 2009 19:36:50 +0000 |
parents | 73dca9808fbe |
children | 7045e9821995 |
comparison
equal
deleted
inserted
replaced
104399:1aa0b1f2d2d1 | 104400:ed5d844496e7 |
---|---|
1376 [scanner scanFloat: &b]; | 1376 [scanner scanFloat: &b]; |
1377 } | 1377 } |
1378 else if (!strncmp(name, "rgb:", 4)) /* A newer X11 format -- rgb:r/g/b */ | 1378 else if (!strncmp(name, "rgb:", 4)) /* A newer X11 format -- rgb:r/g/b */ |
1379 { | 1379 { |
1380 strcpy(hex, name + 4); | 1380 strcpy(hex, name + 4); |
1381 scaling = (strlen(hex) - 2) / 4; | 1381 scaling = (strlen(hex) - 2) / 3; |
1382 } | 1382 } |
1383 else if (name[0] == '#') /* An old X11 format; convert to newer */ | 1383 else if (name[0] == '#') /* An old X11 format; convert to newer */ |
1384 { | 1384 { |
1385 int len = (strlen(name) - 1); | 1385 int len = (strlen(name) - 1); |
1386 int start = (len % 3 == 0) ? 1 : len / 4 + 1; | 1386 int start = (len % 3 == 0) ? 1 : len / 4 + 1; |