typedef struct _mymatrix {
float m00,m01,m10,m11;
char*id;
- double size; // not hashed
} mymatrix_t;
static void* mymatrix_clone(const void*_m) {
h = crc32_add_bytes(h, (char*)&m->m01, sizeof(m->m01));
h = crc32_add_bytes(h, (char*)&m->m10, sizeof(m->m10));
h = crc32_add_bytes(h, (char*)&m->m11, sizeof(m->m11));
+ h = crc32_add_string(h, m->id);
return h;
}
static void mymatrix_destroy(void*_m) {
return *(U32*)&m1->m00 == *(U32*)&m2->m00 &&
*(U32*)&m1->m01 == *(U32*)&m2->m01 &&
*(U32*)&m1->m10 == *(U32*)&m2->m10 &&
- *(U32*)&m1->m11 == *(U32*)&m2->m11;
+ *(U32*)&m1->m11 == *(U32*)&m2->m11 &&
+ !strcmp(m1->id, m2->id);
}
type_t mymatrix_type = {
dup: mymatrix_clone,
#ifdef __GNUC__
void __attribute__((noinline))
- matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out)
+ matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*scalematrix)
#else
-void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out)
+void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*scalematrix)
#endif
{
double l1 = sqrt(in->m00 * in->m00 + in->m01 * in->m01);
double l2 = sqrt(in->m10 * in->m10 + in->m11 * in->m11);
double l = l1+l2;
- if(l < 1e-20) {
+ if(l < 1e-10) {
memset(out, 0, sizeof(*out));
return;
}
out->m00 = in->m00 / l;
- out->m01 = in->m01 / l;
out->m10 = in->m10 / l;
- out->m11 = in->m11 / l;
+ out->m01 = -in->m01 / l;
+ out->m11 = -in->m11 / l;
out->id = (char*)id;
- out->size = l;
+
+ if(scalematrix) {
+ scalematrix->m00 = l;
+ scalematrix->m01 = 0;
+ scalematrix->m10 = 0;
+ scalematrix->m11 = -l;
+ scalematrix->tx = in->tx;
+ scalematrix->ty = in->ty;
+ }
}
typedef struct _matrixdata {
gfxfont_t*font;
mymatrix_t matrix;
int*used;
+ double dx,dy;
} transformedfont_t;
static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
{
internal_t*i = (internal_t*)f->internal;
mymatrix_t m;
- matrix_convert(matrix, font->id, &m);
+ matrix_convert(matrix, font->id, &m, 0);
transformedfont_t*fd = dict_lookup(i->matrices, &m);
if(!fd) {
fd = transformedfont_new(font, &m);
out->drawchar(out, font, glyphnr, color, matrix);
}
+static void glyph_transform(gfxglyph_t*g, mymatrix_t*mm)
+{
+ gfxmatrix_t m;
+ m.m00 = mm->m00;
+ m.m01 = mm->m01;
+ m.m10 = mm->m10;
+ m.m11 = mm->m11;
+ m.tx = 0;
+ m.ty = 0;
+ g->line = gfxline_clone(g->line);
+ gfxline_transform(g->line, &m);
+ if(m.m00>0)
+ g->advance *= m.m00;
+}
+
static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
{
internal_t*i = (internal_t*)f->internal;
int t;
int count=0;
for(t=0;t<fd->orig->num_glyphs;t++) {
- if(fd->used[t]) count++;
+ if(fd->used[t])
+ count++;
}
font->num_glyphs = count;
font->glyphs = rfx_calloc(sizeof(gfxglyph_t)*font->num_glyphs);
for(t=0;t<fd->orig->num_glyphs;t++) {
if(fd->used[t]) {
font->glyphs[count] = fd->orig->glyphs[t];
+ glyph_transform(&font->glyphs[count], &fd->matrix);
fd->used[t] = count;
count++;
}
}
+
+ /* adjust the origin so that every character is to the
+ right of the origin */
+ gfxbbox_t total = {0,0,0,0};
+ double average_xmax = 0;
+ for(t=0;t<count;t++) {
+ gfxline_t*line = font->glyphs[t].line;
+ gfxbbox_t b = gfxline_getbbox(line);
+ total = gfxbbox_expand_to_bbox(total, b);
+ }
+ if(count)
+ average_xmax /= count;
+
+ fd->dx = -total.xmin;
+ fd->dy = 0;
+
+ font->ascent = total.ymax;
+ font->descent = total.ymin;
+
+ for(t=0;t<count;t++) {
+ gfxline_t*line = font->glyphs[t].line;
+ while(line) {
+ line->x += fd->dx;
+ line->y += fd->dy;
+ line->sx += fd->dx;
+ line->sy += fd->dy;
+ line = line->next;
+ }
+ }
gfxfont_fix_unicode(font);
}
return out->finish(out);
}
+static void pass2_addfont(gfxfilter_t*f, gfxfont_t*font, gfxdevice_t*out)
+{
+ /* we throw away original fonts, and do the addfont() for the transformed
+ fonts in the first drawchar() */
+}
+
static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_t*color, gfxmatrix_t*matrix, gfxdevice_t*out)
{
internal_t*i = (internal_t*)f->internal;
}
mymatrix_t m;
- matrix_convert(matrix, font->id, &m);
+ gfxmatrix_t scalematrix;
+ matrix_convert(matrix, font->id, &m, &scalematrix);
transformedfont_t*d = dict_lookup(i->matrices, &m);
- out->drawchar(out, d->font, d->used[glyphnr], color, matrix);
+ scalematrix.tx -= d->dx;
+ scalematrix.ty -= d->dy;
+ out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);
}
void gfxtwopassfilter_remove_font_transforms_init(gfxtwopassfilter_t*f)
f->pass1.internal = i;
f->pass2.name = "remove font transforms pass 2";
+ f->pass2.addfont = pass2_addfont;
f->pass2.drawchar = pass2_drawchar;
f->pass2.internal = i;