git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added MD5 support.
[swftools.git]
/
pdf2swf
/
xpdf
/
Lexer.cc
diff --git
a/pdf2swf/xpdf/Lexer.cc
b/pdf2swf/xpdf/Lexer.cc
index
4ca8cfe
..
d037469
100644
(file)
--- a/
pdf2swf/xpdf/Lexer.cc
+++ b/
pdf2swf/xpdf/Lexer.cc
@@
-2,7
+2,7
@@
//
// Lexer.cc
//
//
// Lexer.cc
//
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
//
//========================================================================
//
//========================================================================
@@
-10,6
+10,7
@@
#pragma implementation
#endif
#pragma implementation
#endif
+#include <aconf.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
@@
-44,22
+45,22
@@
static char specialChars[256] = {
// Lexer
//------------------------------------------------------------------------
// Lexer
//------------------------------------------------------------------------
-Lexer::Lexer(Stream *str) {
+Lexer::Lexer(XRef *xref, Stream *str) {
Object obj;
curStr.initStream(str);
Object obj;
curStr.initStream(str);
- streams = new Array();
+ streams = new Array(xref);
streams->add(curStr.copy(&obj));
strPtr = 0;
freeArray = gTrue;
curStr.streamReset();
}
streams->add(curStr.copy(&obj));
strPtr = 0;
freeArray = gTrue;
curStr.streamReset();
}
-Lexer::Lexer(Object *obj) {
+Lexer::Lexer(XRef *xref, Object *obj) {
Object obj2;
if (obj->isStream()) {
Object obj2;
if (obj->isStream()) {
- streams = new Array();
+ streams = new Array(xref);
freeArray = gTrue;
streams->add(obj->copy(&obj2));
} else {
freeArray = gTrue;
streams->add(obj->copy(&obj2));
} else {
@@
-204,11
+205,15
@@
Object *Lexer::getObj(Object *obj) {
case '(':
++numParen;
case '(':
++numParen;
+ c2 = c;
break;
case ')':
break;
case ')':
- if (--numParen == 0)
+ if (--numParen == 0) {
done = gTrue;
done = gTrue;
+ } else {
+ c2 = c;
+ }
break;
case '\\':
break;
case '\\':