git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c516d8e
)
made error reporting less verbose
author
kramm
<kramm>
Sun, 16 Apr 2006 13:37:47 +0000
(13:37 +0000)
committer
kramm
<kramm>
Sun, 16 Apr 2006 13:37:47 +0000
(13:37 +0000)
pdf2swf/xpdf/Lexer.cc
patch
|
blob
|
history
diff --git
a/pdf2swf/xpdf/Lexer.cc
b/pdf2swf/xpdf/Lexer.cc
index
9f0c3ca
..
ee9dc59
100644
(file)
--- a/
pdf2swf/xpdf/Lexer.cc
+++ b/
pdf2swf/xpdf/Lexer.cc
@@
-74,6
+74,7
@@
Lexer::Lexer(XRef *xref, Object *obj) {
curStr.streamReset();
}
}
curStr.streamReset();
}
}
+static int illegalChars = 0;
Lexer::~Lexer() {
if (!curStr.isNone()) {
Lexer::~Lexer() {
if (!curStr.isNone()) {
@@
-83,6
+84,9
@@
Lexer::~Lexer() {
if (freeArray) {
delete streams;
}
if (freeArray) {
delete streams;
}
+ if(illegalChars)
+ error(0, "Illegal characters in hex string (%d)", illegalChars);
+ illegalChars = 0;
}
int Lexer::getChar() {
}
int Lexer::getChar() {
@@
-330,7
+334,8
@@
Object *Lexer::getObj(Object *obj) {
} else if (c2 >= 'a' && c2 <= 'f') {
c += c2 - 'a' + 10;
} else {
} else if (c2 >= 'a' && c2 <= 'f') {
c += c2 - 'a' + 10;
} else {
- error(getPos(), "Illegal digit in hex char in name");
+ illegalChars++;
+ //error(getPos(), "Illegal digit in hex char in name");
}
}
notEscChar:
}
}
notEscChar:
@@
-384,8
+389,10
@@
Object *Lexer::getObj(Object *obj) {
c2 += c - 'A' + 10;
else if (c >= 'a' && c <= 'f')
c2 += c - 'a' + 10;
c2 += c - 'A' + 10;
else if (c >= 'a' && c <= 'f')
c2 += c - 'a' + 10;
- else
- error(getPos(), "Illegal character <%02x> in hex string", c);
+ else {
+ illegalChars++;
+ //error(getPos(), "Illegal character <%02x> in hex string", c);
+ }
if (++m == 2) {
if (n == tokBufSize) {
if (!s)
if (++m == 2) {
if (n == tokBufSize) {
if (!s)
@@
-421,7
+428,8
@@
Object *Lexer::getObj(Object *obj) {
tokBuf[2] = '\0';
obj->initCmd(tokBuf);
} else {
tokBuf[2] = '\0';
obj->initCmd(tokBuf);
} else {
- error(getPos(), "Illegal character '>'");
+ illegalChars++;
+ //error(getPos(), "Illegal character '>'");
obj->initError();
}
break;
obj->initError();
}
break;
@@
-430,7
+438,8
@@
Object *Lexer::getObj(Object *obj) {
case ')':
case '{':
case '}':
case ')':
case '{':
case '}':
- error(getPos(), "Illegal character '%c'", c);
+ //error(getPos(), "Illegal character '%c'", c);
+ illegalChars++;
obj->initError();
break;
obj->initError();
break;
@@
-459,7
+468,6
@@
Object *Lexer::getObj(Object *obj) {
}
break;
}
}
break;
}
-
return obj;
}
return obj;
}