1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
diff --git a/aha.c b/aha.c
index 46e43c0..2bfebb7 100644
--- a/aha.c
+++ b/aha.c
@@ -138,6 +138,15 @@ pelem parseInsert(char* s)
return firstelem;
}
+int parseDepthAtLeast(pelem elem, unsigned int wanted) {
+ while (elem != NULL) {
+ if (wanted == 0) return 1;
+ elem = elem->next;
+ --wanted;
+ }
+ return 0;
+}
+
void deleteParse(pelem elem)
{
while (elem!=NULL)
@@ -831,27 +840,20 @@ int main(int argc,char* args[])
}
else
if (momelem->value == 38 &&
- momelem->next &&
- momelem->next->value == 2 &&
- momelem->next->next)// 38;2;<n> -> 24 Bit
+ parseDepthAtLeast(momelem, 4) &&
+ momelem->next->value == 2)// 38;2;<r>;<g>;<b> -> 24 Bit
{
- momelem = momelem->next->next;
- pelem r,g,b;
- r = momelem;
- momelem = momelem->next;
- g = momelem;
- if ( momelem )
- momelem = momelem->next;
- b = momelem;
- if ( r && g && b )
- {
- state.highlighted = 0;
- state.fc_colormode = MODE_24BIT;
- *dest =
- (r->value & 255) * 65536 +
- (g->value & 255) * 256 +
- (b->value & 255);
- }
+ pelem r = momelem->next->next;
+ pelem g = r->next;
+ pelem b = g->next;
+ momelem = b;
+
+ state.highlighted = 0;
+ state.fc_colormode = MODE_24BIT;
+ *dest =
+ (r->value & 255) * 65536 +
+ (g->value & 255) * 256 +
+ (b->value & 255);
}
else
{
@@ -899,27 +901,20 @@ int main(int argc,char* args[])
}
else
if (momelem->value == 48 &&
- momelem->next &&
- momelem->next->value == 2 &&
- momelem->next->next)// 48;2;<n> -> 24 Bit
+ parseDepthAtLeast(momelem, 4) &&
+ momelem->next->value == 2)// 48;2;<r>;<g>;<b> -> 24 Bit
{
- momelem = momelem->next->next;
- pelem r,g,b;
- r = momelem;
- momelem = momelem->next;
- g = momelem;
- if ( momelem )
- momelem = momelem->next;
- b = momelem;
- if ( r && g && b )
- {
- state.bc_colormode = MODE_24BIT;
- state.highlighted = 0;
- *dest =
- (r->value & 255) * 65536 +
- (g->value & 255) * 256 +
- (b->value & 255);
- }
+ pelem r = momelem->next->next;
+ pelem g = r->next;
+ pelem b = g->next;
+ momelem = b;
+
+ state.bc_colormode = MODE_24BIT;
+ state.highlighted = 0;
+ *dest =
+ (r->value & 255) * 65536 +
+ (g->value & 255) * 256 +
+ (b->value & 255);
}
else
{
--
2.35.1
|
GitWeb