author | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
commit | 118d03d815a7615b9c53363218a7ac45b3f4c514 (patch) (unidiff) | |
tree | 356953e2413cddcec0f35bd47bb6439767da7051 /noncore/apps/opie-reader/CEncoding.cpp | |
parent | 00894537decf01c5a5cdc565b2740b5e67a2e90f (diff) | |
download | opie-118d03d815a7615b9c53363218a7ac45b3f4c514.zip opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.gz opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.bz2 |
Incorporated TimWs current source tree and make it compile
Diffstat (limited to 'noncore/apps/opie-reader/CEncoding.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/CEncoding.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/opie-reader/CEncoding.cpp b/noncore/apps/opie-reader/CEncoding.cpp index c1dcfe8..60a1057 100644 --- a/noncore/apps/opie-reader/CEncoding.cpp +++ b/noncore/apps/opie-reader/CEncoding.cpp | |||
@@ -1,26 +1,26 @@ | |||
1 | #include <stdio.h> | 1 | #include <stdio.h> |
2 | #include "CEncoding.h" | 2 | #include "CEncoding.h" |
3 | 3 | ||
4 | void CUtf8::getch(tchar& ch, CStyle& sty) | 4 | void CUtf8::getch(tchar& ch, CStyle& sty) |
5 | { | 5 | { |
6 | int iret; | 6 | tchar ret; |
7 | parent->getch(iret, sty); | 7 | parent->getch(ret, sty); |
8 | if (iret == EOF) | 8 | if (ret == UEOF) |
9 | { | 9 | { |
10 | ch = UEOF; | 10 | ch = UEOF; |
11 | return; | 11 | return; |
12 | } | 12 | } |
13 | tchar ret = iret; | ||
14 | int count = 0; | 13 | int count = 0; |
15 | if (ret & (1 << 7)) | 14 | if (ret & (1 << 7)) |
16 | { | 15 | { |
17 | unsigned char flags = ret << 1; | 16 | unsigned char flags = ret << 1; |
18 | while ((flags & (1 << 7)) != 0) | 17 | while ((flags & (1 << 7)) != 0) |
19 | { | 18 | { |
20 | ret <<= 6; | 19 | ret <<= 6; |
20 | tchar iret; | ||
21 | parent->getch(iret, sty); | 21 | parent->getch(iret, sty); |
22 | ret += iret & 0x3f; | 22 | ret += iret & 0x3f; |
23 | flags <<= 1; | 23 | flags <<= 1; |
24 | count++; | 24 | count++; |
25 | } | 25 | } |
26 | switch (count) | 26 | switch (count) |
@@ -42,46 +42,46 @@ void CUtf8::getch(tchar& ch, CStyle& sty) | |||
42 | ch = ret; | 42 | ch = ret; |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | 45 | ||
46 | void CUcs16be::getch(tchar& ch, CStyle& sty) | 46 | void CUcs16be::getch(tchar& ch, CStyle& sty) |
47 | { | 47 | { |
48 | int iret; | 48 | tchar iret; |
49 | parent->getch(iret, sty); | 49 | parent->getch(iret, sty); |
50 | if (iret == EOF) | 50 | if (iret == UEOF) |
51 | { | 51 | { |
52 | ch = UEOF; | 52 | ch = UEOF; |
53 | return; | 53 | return; |
54 | } | 54 | } |
55 | tchar ret = iret; | 55 | tchar ret = iret; |
56 | parent->getch(iret, sty); | 56 | parent->getch(iret, sty); |
57 | ch = (ret << 8) + iret; | 57 | ch = (ret << 8) + iret; |
58 | } | 58 | } |
59 | 59 | ||
60 | void CUcs16le::getch(tchar& ch, CStyle& sty) | 60 | void CUcs16le::getch(tchar& ch, CStyle& sty) |
61 | { | 61 | { |
62 | int iret; | 62 | tchar iret; |
63 | parent->getch(iret, sty); | 63 | parent->getch(iret, sty); |
64 | if (iret == EOF) | 64 | if (iret == UEOF) |
65 | { | 65 | { |
66 | ch = UEOF; | 66 | ch = UEOF; |
67 | return; | 67 | return; |
68 | } | 68 | } |
69 | tchar ret = iret; | 69 | tchar ret = iret; |
70 | parent->getch(iret, sty); | 70 | parent->getch(iret, sty); |
71 | ch = ret + (iret << 8); | 71 | ch = ret + (iret << 8); |
72 | } | 72 | } |
73 | 73 | ||
74 | void Ccp1252::getch(tchar& ch, CStyle& sty) | 74 | void Ccp1252::getch(tchar& ch, CStyle& sty) |
75 | { | 75 | { |
76 | int iret; | 76 | tchar iret; |
77 | parent->getch(iret, sty); | 77 | parent->getch(iret, sty); |
78 | ch = iret; | 78 | ch = iret; |
79 | switch (ch) | 79 | switch (ch) |
80 | { | 80 | { |
81 | case EOF: | 81 | case UEOF: |
82 | ch = UEOF; | 82 | ch = UEOF; |
83 | break; | 83 | break; |
84 | case 0x80: | 84 | case 0x80: |
85 | ch = 0x20ac; | 85 | ch = 0x20ac; |
86 | break; | 86 | break; |
87 | case 0x82: | 87 | case 0x82: |
@@ -194,15 +194,15 @@ void CPalm::getch(tchar& ch, CStyle& sty) | |||
194 | break; | 194 | break; |
195 | } | 195 | } |
196 | } | 196 | } |
197 | 197 | ||
198 | void CAscii::getch(tchar& ch, CStyle& sty) | 198 | void CAscii::getch(tchar& ch, CStyle& sty) |
199 | { | 199 | { |
200 | int iret; | 200 | tchar iret; |
201 | parent->getch(iret, sty); | 201 | parent->getch(iret, sty); |
202 | if (iret == EOF) | 202 | if (iret == UEOF) |
203 | { | 203 | { |
204 | ch = UEOF; | 204 | ch = UEOF; |
205 | } | 205 | } |
206 | else | 206 | else |
207 | { | 207 | { |
208 | ch = iret; | 208 | ch = iret; |