git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made font pretransforming always generate points to the right of the origin
[swftools.git]
/
lib
/
devices
/
swf.c
diff --git
a/lib/devices/swf.c
b/lib/devices/swf.c
index
5f0fe70
..
b090c7b
100644
(file)
--- a/
lib/devices/swf.c
+++ b/
lib/devices/swf.c
@@
-42,7
+42,7
@@
#include "../gfxtools.h"
#include "swf.h"
#include "../gfxpoly.h"
#include "../gfxtools.h"
#include "swf.h"
#include "../gfxpoly.h"
-#include "../png.h"
+#include "../gfximage.h"
#define CHARDATAMAX 1024
#define CHARMIDX 0
#define CHARDATAMAX 1024
#define CHARMIDX 0
@@
-102,6
+102,7
@@
typedef struct _swfoutput_internal
int config_storeallcharacters;
int config_enablezlib;
int config_insertstoptag;
int config_storeallcharacters;
int config_enablezlib;
int config_insertstoptag;
+ int config_showimages;
int config_watermark;
int config_noclips;
int config_flashversion;
int config_watermark;
int config_noclips;
int config_flashversion;
@@
-955,6
+956,7
@@
static void endpage(gfxdevice_t*dev)
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
if(i->pagefinished)
return;
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
if(i->pagefinished)
return;
+
if(i->shapeid>=0)
endshape(dev);
if(i->textmode)
if(i->shapeid>=0)
endshape(dev);
if(i->textmode)
@@
-2120,6
+2122,10
@@
int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
i->config_dumpfonts = atoi(value);
} else if(!strcmp(name, "animate")) {
i->config_animate = atoi(value);
i->config_dumpfonts = atoi(value);
} else if(!strcmp(name, "animate")) {
i->config_animate = atoi(value);
+ } else if(!strcmp(name, "linknameurl")) {
+ i->config_linknameurl = atoi(value);
+ } else if(!strcmp(name, "showimages")) {
+ i->config_showimages = atoi(value);
} else if(!strcmp(name, "disablelinks")) {
i->config_disablelinks = atoi(value);
} else if(!strcmp(name, "simpleviewer")) {
} else if(!strcmp(name, "disablelinks")) {
i->config_disablelinks = atoi(value);
} else if(!strcmp(name, "simpleviewer")) {
@@
-2255,7
+2261,9
@@
static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int
if(newsizex<sizex || newsizey<sizey) {
msg("<verbose> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
if(newsizex<sizex || newsizey<sizey) {
msg("<verbose> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
- newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey);
+ gfximage_t*ni = gfximage_rescale(img, newsizex, newsizey);
+ newpic = (RGBA*)ni->data;
+ free(ni);
*newwidth = sizex = newsizex;
*newheight = sizey = newsizey;
mem = newpic;
*newwidth = sizex = newsizex;
*newheight = sizey = newsizey;
mem = newpic;
@@
-2357,6
+2365,11
@@
static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
SHAPE*shape;
swf_ShapeNew(&shape);
int fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1);
SHAPE*shape;
swf_ShapeNew(&shape);
int fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1);
+ int lsid = 0;
+ if(i->config_showimages) {
+ RGBA pink = {255,255,0,255};
+ lsid = swf_ShapeAddLineStyle(shape, 20, &pink);
+ }
swf_SetU16(i->tag, myshapeid);
SRECT r = gfxline_getSWFbbox(line);
r = swf_ClipRect(i->pagebbox, r);
swf_SetU16(i->tag, myshapeid);
SRECT r = gfxline_getSWFbbox(line);
r = swf_ClipRect(i->pagebbox, r);
@@
-2364,7
+2377,7
@@
static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
swf_SetShapeStyles(i->tag,shape);
swf_ShapeCountBits(shape,NULL,NULL);
swf_SetShapeBits(i->tag,shape);
swf_SetShapeStyles(i->tag,shape);
swf_ShapeCountBits(shape,NULL,NULL);
swf_SetShapeBits(i->tag,shape);
- swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
+ swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,fsid,0);
i->swflastx = i->swflasty = UNDEFINED_COORD;
drawgfxline(dev, line, 1);
swf_ShapeSetEnd(i->tag);
i->swflastx = i->swflasty = UNDEFINED_COORD;
drawgfxline(dev, line, 1);
swf_ShapeSetEnd(i->tag);
@@
-2813,21
+2826,26
@@
static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
swffont->glyph2ascii = (U16*)rfx_calloc(sizeof(U16)*swffont->numchars);
swffont->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH)*swffont->numchars);
swffont->glyphnames = (char**)rfx_calloc(sizeof(char*)*swffont->numchars);
swffont->glyph2ascii = (U16*)rfx_calloc(sizeof(U16)*swffont->numchars);
swffont->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH)*swffont->numchars);
swffont->glyphnames = (char**)rfx_calloc(sizeof(char*)*swffont->numchars);
- for(t=0;t<font->max_unicode;t++) {
- swffont->ascii2glyph[t] = font->unicode2glyph[t];
- }
+
SRECT max = {0,0,0,0};
for(t=0;t<font->num_glyphs;t++) {
drawer_t draw;
gfxline_t*line;
double advance = 0;
SRECT max = {0,0,0,0};
for(t=0;t<font->num_glyphs;t++) {
drawer_t draw;
gfxline_t*line;
double advance = 0;
- swffont->glyph2ascii[t] = font->glyphs[t].unicode;
- if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) {
+ int u = font->glyphs[t].unicode;
+ int s;
+ char twice=0;
+ for(s=0;s<font->num_glyphs;s++) {
+ if(swffont->glyph2ascii[s]==u)
+ twice=1;
+ }
+ if(u >= 0xe000 || u == 0x0000 || twice) {
/* flash 8 flashtype requires unique unicode IDs for each character.
We use the Unicode private user area to assign characters, hoping that
the font doesn't contain more than 2048 glyphs */
/* flash 8 flashtype requires unique unicode IDs for each character.
We use the Unicode private user area to assign characters, hoping that
the font doesn't contain more than 2048 glyphs */
- swffont->glyph2ascii[t] = 0xe000 + (t&0x1fff);
+ u = 0xe000 + (t&0x1fff);
}
}
+ swffont->glyph2ascii[t] = u;
if(font->glyphs[t].name) {
swffont->glyphnames[t] = strdup(font->glyphs[t].name);
if(font->glyphs[t].name) {
swffont->glyphnames[t] = strdup(font->glyphs[t].name);
@@
-2845,6
+2863,11
@@
static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
c.x = line->sx * scale; c.y = -line->sy * scale;
//to.x = floor(line->x * scale); to.y = floor(-line->y * scale);
to.x = line->x * scale; to.y = -line->y * scale;
c.x = line->sx * scale; c.y = -line->sy * scale;
//to.x = floor(line->x * scale); to.y = floor(-line->y * scale);
to.x = line->x * scale; to.y = -line->y * scale;
+
+ /*if(strstr(swffont->name, "BIRNU") && t==90) {
+ to.x += 1;
+ }*/
+
if(line->type == gfx_moveTo) {
draw.moveTo(&draw, &to);
} else if(line->type == gfx_lineTo) {
if(line->type == gfx_moveTo) {
draw.moveTo(&draw, &to);
} else if(line->type == gfx_lineTo) {
@@
-2873,6
+2896,7
@@
static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]);
}
swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]);
}
+
for(t=0;t<font->num_glyphs;t++) {
SRECT bbox = swffont->layout->bounds[t];
for(t=0;t<font->num_glyphs;t++) {
SRECT bbox = swffont->layout->bounds[t];
@@
-2912,6
+2936,7
@@
static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
if(font->descent*20 > swffont->layout->descent)
swffont->layout->descent = font->descent*20;
if(font->descent*20 > swffont->layout->descent)
swffont->layout->descent = font->descent*20;
+ swf_FontSort(swffont);
return swffont;
}
return swffont;
}
@@
-2958,11
+2983,6
@@
static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font)
l->swffont->layout->bounds[iii].xmax/20.0,
l->swffont->layout->bounds[iii].ymax/20.0
);
l->swffont->layout->bounds[iii].xmax/20.0,
l->swffont->layout->bounds[iii].ymax/20.0
);
- int t;
- for(t=0;t<l->swffont->maxascii;t++) {
- if(l->swffont->ascii2glyph[t] == iii)
- msg("<debug> | - maps to %d",t);
- }
}
}
}
}
}
}
@@
-3066,6
+3086,7
@@
static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
msg("<warning> No character %d in font %s (%d chars)", glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars);
return;
}
msg("<warning> No character %d in font %s (%d chars)", glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars);
return;
}
+ glyph = i->swffont->glyph2glyph[glyph];
setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 0);
setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 0);