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 class members, expression lefthands
[swftools.git]
/
lib
/
devices
/
text.c
diff --git
a/lib/devices/text.c
b/lib/devices/text.c
index
d5b4bbc
..
4bdcdaf
100644
(file)
--- a/
lib/devices/text.c
+++ b/
lib/devices/text.c
@@
-60,7
+60,7
@@
void text_startpage(gfxdevice_t*dev, int width, int height)
i->current_page = i->current_page->next;
}
i->current_page->textsize = 4096;
i->current_page = i->current_page->next;
}
i->current_page->textsize = 4096;
- i->current_page->text = malloc(i->current_page->textsize);
+ i->current_page->text = (char*)malloc(i->current_page->textsize);
i->current_page->textpos = 0;
i->current_page->next = 0;
i->currentx = 0;
i->current_page->textpos = 0;
i->current_page->next = 0;
i->currentx = 0;
@@
-120,9
+120,10
@@
void text_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*colo
} else if(xshift > i->lastadvance*1.3 || xshift<0) {
addchar(dev, 32);
}
} else if(xshift > i->lastadvance*1.3 || xshift<0) {
addchar(dev, 32);
}
+ int u;
if(font) {
i->lastadvance = font->glyphs[glyphnr].advance*matrix->m00;
if(font) {
i->lastadvance = font->glyphs[glyphnr].advance*matrix->m00;
- int u = font->glyphs[glyphnr].unicode;
+ u = font->glyphs[glyphnr].unicode;
} else {
u = glyphnr;
i->currentx = 0;i->currenty = 0;
} else {
u = glyphnr;
i->currentx = 0;i->currenty = 0;
@@
-132,7
+133,7
@@
void text_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*colo
}
}
}
}
-void text_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action)
+void text_drawlink(gfxdevice_t*dev, gfxline_t*line, const char*action)
{
internal_t*i = (internal_t*)dev->internal;
}
{
internal_t*i = (internal_t*)dev->internal;
}
@@
-146,7
+147,7
@@
void text_result_write(gfxresult_t*r, int filedesc)
{
textpage_t*i= (textpage_t*)r->internal;
}
{
textpage_t*i= (textpage_t*)r->internal;
}
-int text_result_save(gfxresult_t*r, char*filename)
+int text_result_save(gfxresult_t*r, const char*filename)
{
textpage_t*i= (textpage_t*)r->internal;
if(!i) {
{
textpage_t*i= (textpage_t*)r->internal;
if(!i) {
@@
-162,7
+163,7
@@
int text_result_save(gfxresult_t*r, char*filename)
fclose(fi);
return 1;
}
fclose(fi);
return 1;
}
-void*text_result_get(gfxresult_t*r, char*name)
+void*text_result_get(gfxresult_t*r, const char*name)
{
textpage_t*i= (textpage_t*)r->internal;
if(!strcmp(name,"text")) {
{
textpage_t*i= (textpage_t*)r->internal;
if(!strcmp(name,"text")) {
@@
-172,7
+173,7
@@
void*text_result_get(gfxresult_t*r, char*name)
len += i->textpos;
j = j->next;
}
len += i->textpos;
j = j->next;
}
- char*text = malloc(len);
+ char*text = (char*)malloc(len);
int pos = 0;
j = i;
while(j) {
int pos = 0;
j = i;
while(j) {