git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to xpdf 1.01.
[swftools.git]
/
src
/
combine.c
diff --git
a/src/combine.c
b/src/combine.c
index
4847a58
..
9a033cb
100644
(file)
--- a/
src/combine.c
+++ b/
src/combine.c
@@
-84,7
+84,7
@@
void jpeg_assert()
pos++;
}
pos = 0;
pos++;
}
pos = 0;
- while(master.tags[pos].id != 0)
+ while(slave.tags[pos].id != 0)
{
if(slave.tags[pos].id == TAGID_JPEGTABLES)
spos = pos;
{
if(slave.tags[pos].id == TAGID_JPEGTABLES)
spos = pos;
@@
-581,7
+581,7
@@
uchar * normalcombine(uchar*masterdata, int masterlength, char*_slavename, uchar
int spriteid = -1;
int replaceddefine = -1;
struct writer_t w;
int spriteid = -1;
int replaceddefine = -1;
struct writer_t w;
- int frame;
+ int frame = 0;
char*framelabel;
length = masterlength + slavelength*2 + 128; // this is a guess, but a good guess.
char*framelabel;
length = masterlength + slavelength*2 + 128; // this is a guess, but a good guess.