From c788b3270c1380af50d9ff83341b81565b74b28f Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Fri, 5 Mar 2010 18:45:38 -0800 Subject: [PATCH] started implementing the remove_font_transforms filter --- lib/Makefile.in | 5 ++ lib/filters/remove_font_transforms.c | 159 +++++++++++++++++++++++++++++++++- lib/pdf/Makefile.in | 1 + lib/q.c | 12 +++ lib/q.h | 1 + 5 files changed, 177 insertions(+), 1 deletion(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 566cff3..deaf9dc 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -158,22 +158,27 @@ readers/image.$(O): readers/image.c readers/image.h $(C) readers/image.c -o readers/image.$(O) libocr$(A): $(ocr_objects) devices/ocr.$(O) + rm -f libocr$(A) $(AR) r libocr$(A) $(ocr_objects) devices/ocr.$(O) $(RANLIB) libocr$(A) libbase$(A): $(base_objects) Makefile + rm -f libbase$(A) $(AR) r libbase$(A) $(base_objects) $(RANLIB) libbase$(A) libgfxswf$(A): devices/swf.$(O) readers/swf2.$(O) readers/image.$(O) + rm -f libgfxswf$(A) $(AR) r libgfxswf$(A) devices/swf.$(O) readers/swf2.$(O) readers/image.$(O) $(RANLIB) libgfxswf$(A) libgfx$(A): $(gfx_objects) $(gfxpoly_objects) Makefile + rm -f libgfx$(A) $(AR) r libgfx$(A) $(gfx_objects) $(gfxpoly_objects) $(RANLIB) libgfx$(A) librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) $(as3compiler_objects) Makefile + rm -f librfxswf$(A) $(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) $(as3compiler_objects) $(RANLIB) librfxswf$(A) diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c index 7e0b31c..bdaae38 100644 --- a/lib/filters/remove_font_transforms.c +++ b/lib/filters/remove_font_transforms.c @@ -19,38 +19,195 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include +#include #include #include "../gfxfilter.h" #include "../gfxtools.h" +#include "../gfxfont.h" #include "../types.h" #include "../mem.h" +#include "../q.h" + +typedef struct _mymatrix { + float m00,m01,m10,m11; + char*id; + double size; // not hashed +} mymatrix_t; + +static void* mymatrix_clone(const void*_m) { + if(_m==0) + return 0; + const mymatrix_t*m1=_m; + mymatrix_t*m2 = malloc(sizeof(mymatrix_t)); + *m2 = *m1; + m2->id = strdup(m1->id); + return m2; +} +static unsigned int mymatrix_hash(const void*_m) { + if(!_m) + return 0; + const mymatrix_t*m = (mymatrix_t*)_m; + unsigned int h=0; + h = crc32_add_bytes(h, (char*)&m->m00, sizeof(m->m00)); + 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)); + return h; +} +static void mymatrix_destroy(void*_m) { + mymatrix_t*m = (mymatrix_t*)_m; + free(m->id);m->id=0; + free(m); +} +static char mymatrix_equals(const void*_m1, const void*_m2) { + const mymatrix_t*m1=_m1; + const mymatrix_t*m2=_m2; + if(!m1 || !m2) + return m1==m2; + + /* we do a binary comparison of the float32 + bits here instead of a numerical comparison + to prevent the compiler from e.g. removing the + (float) cast during optimization, which would break + the equivalence between equals() and hash() (as + the hash is derived from the float32 values) */ + 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; +} +type_t mymatrix_type = { + dup: mymatrix_clone, + hash: mymatrix_hash, + free: mymatrix_destroy, + equals: mymatrix_equals +}; typedef struct _internal { + dict_t*matrices; + char first; } internal_t; + +#ifdef __GNUC__ +void __attribute__((noinline)) + matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out) +#else +void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out) +#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) { + 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->id = (char*)id; + out->size = l; +} + +typedef struct _matrixdata { + gfxfontlist_t*fonts; +} matrixdata_t; + +typedef struct _transformedfont { + gfxfont_t*orig; + gfxfont_t*font; + mymatrix_t matrix; + int*used; +} transformedfont_t; + +static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m) +{ + transformedfont_t*f = rfx_calloc(sizeof(transformedfont_t)); + f->orig = orig; + f->matrix = *m; + f->used = malloc(sizeof(f->used[0])*orig->num_glyphs); + return f; +} + static void pass1_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); + transformedfont_t*fd = dict_lookup(i->matrices, &m); + if(!fd) { + fd = transformedfont_new(font, &m); + dict_put(i->matrices, &m, fd); + } + fd->used[glyphnr]=1; out->drawchar(out, font, glyphnr, color, matrix); } +static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out) +{ + internal_t*i = (internal_t*)f->internal; + DICT_ITERATE_DATA(i->matrices, transformedfont_t*, fd) { + gfxfont_t*font = fd->font = rfx_calloc(sizeof(gfxfont_t)); + char id[80]; + static int fontcount=0; + sprintf(id, "font%d", fontcount++); + font->id = strdup(id); + int t; + int count=0; + for(t=0;torig->num_glyphs;t++) { + if(fd->used[t]) count++; + } + font->num_glyphs = count; + font->glyphs = rfx_calloc(sizeof(gfxglyph_t)*font->num_glyphs); + count = 0; + for(t=0;torig->num_glyphs;t++) { + if(fd->used[t]) { + font->glyphs[count] = fd->orig->glyphs[t]; + fd->used[t] = count; + count++; + } + } + gfxfont_fix_unicode(font); + } + return out->finish(out); +} + 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; - out->drawchar(out, font, glyphnr, color, matrix); + + if(i->first) { + i->first = 0; + DICT_ITERATE_DATA(i->matrices, transformedfont_t*, fd) { + out->addfont(out, fd->font); + } + } + + mymatrix_t m; + matrix_convert(matrix, font->id, &m); + transformedfont_t*d = dict_lookup(i->matrices, &m); + out->drawchar(out, d->font, d->used[glyphnr], color, matrix); } void gfxtwopassfilter_remove_font_transforms_init(gfxtwopassfilter_t*f) { internal_t*i = (internal_t*)rfx_calloc(sizeof(internal_t)); + memset(f, 0, sizeof(gfxtwopassfilter_t)); f->type = gfxfilter_twopass; + f->pass1.name = "remove font transforms pass 1"; f->pass1.drawchar = pass1_drawchar; + f->pass1.finish = pass1_finish; f->pass1.internal = i; f->pass2.name = "remove font transforms pass 2"; f->pass2.drawchar = pass2_drawchar; f->pass2.internal = i; + + i->matrices = dict_new2(&mymatrix_type); + i->first = 1; } diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in index b700625..64cc8b5 100644 --- a/lib/pdf/Makefile.in +++ b/lib/pdf/Makefile.in @@ -155,6 +155,7 @@ xpdf/%.$(O): xpdf/%.cc ../libgfxpdf$(A): $(XPDFOK) $(libgfxpdf_objects) $(xpdf_in_source) $(splash_in_source) + rm -f ../librfxswf$(A) $(AR) r ../libgfxpdf$(A) $(libgfxpdf_objects) $(xpdf_in_source) $(splash_in_source) $(RANLIB) ../libgfxpdf$(A) diff --git a/lib/q.c b/lib/q.c index a16d1b3..9f7ce2c 100644 --- a/lib/q.c +++ b/lib/q.c @@ -688,6 +688,18 @@ unsigned int crc32_add_string(unsigned int checksum, const char*s) } return checksum; } +unsigned int crc32_add_bytes(unsigned int checksum, const void*_s, int len) +{ + unsigned char*s = (unsigned char*)_s; + crc32_init(); + if(!s || !len) + return checksum; + do { + checksum = checksum>>8 ^ crc32[(*s^checksum)&0xff]; + s++; + } while(--len); + return checksum; +} unsigned int string_hash(const string_t*str) { diff --git a/lib/q.h b/lib/q.h index 2be015f..58e18c3 100644 --- a/lib/q.h +++ b/lib/q.h @@ -152,6 +152,7 @@ float medianf(float*values, int n); unsigned int crc32_add_byte(unsigned int crc32, unsigned char b); unsigned int crc32_add_string(unsigned int crc32, const char*s); +unsigned int crc32_add_bytes(unsigned int checksum, const void*s, int len); void mem_init(mem_t*mem); int mem_put(mem_t*m, void*data, int length); -- 1.7.10.4