DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00
Code

Code cleaning

Browse Source
This commit is contained in:
Duan Yao 2014-06-17 11:19:24 +08:00
parent 1d95b73eee
commit 55d45acd32
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/DrawingTracer.cc
View File

@ -162,8 +162,8 @@ void DrawingTracer::draw_non_char_bbox(GfxState * state, double * bbox)
void DrawingTracer::draw_char_bbox(GfxState * state, double * bbox) void DrawingTracer::draw_char_bbox(GfxState * state, double * bbox)
{ {
// Note: even if 4 corner of the char are all in the clip area, // Note: even if 4 corners of the char are all in or all out of the clip area,
// it still could be partially clipped. // it could still be partially clipped.
// TODO better solution? // TODO better solution?
int pt_in = 0; int pt_in = 0;
if (cairo_in_clip(cairo, bbox[0], bbox[1])) if (cairo_in_clip(cairo, bbox[0], bbox[1]))
@ -216,11 +216,9 @@ void DrawingTracer::draw_char(GfxState *state, double x, double y, double ax, do
return; return;
Matrix tm, itm; Matrix tm, itm;
//memcpy(tm_ctm.m, this->cur_text_tm, sizeof(tm_ctm.m));
memcpy(tm.m, state->getTextMat(), sizeof(tm.m)); memcpy(tm.m, state->getTextMat(), sizeof(tm.m));
double fs = state->getFontSize();
double cx = state->getCurX(), cy = state->getCurY(), double cx = state->getCurX(), cy = state->getCurY(), fs = state->getFontSize(),
ry = state->getRise(), h = state->getHorizScaling(); ry = state->getRise(), h = state->getHorizScaling();
//cx and cy has been transformed by text matrix, we need to reverse them. //cx and cy has been transformed by text matrix, we need to reverse them.
@ -229,10 +227,10 @@ void DrawingTracer::draw_char(GfxState *state, double x, double y, double ax, do
itm.transform(cx, cy, &char_cx, &char_cy); itm.transform(cx, cy, &char_cx, &char_cy);
//TODO Vertical? Currently vertical/type3 chars are treated as non-chars. //TODO Vertical? Currently vertical/type3 chars are treated as non-chars.
double tchar[6] {fs * h, 0, 0, fs, char_cx + x, char_cy + y + ry}; double char_m[6] {fs * h, 0, 0, fs, char_cx + x, char_cy + y + ry};
double tfinal[6]; double final_m[6];
tm_multiply(tfinal, tm.m, tchar); tm_multiply(final_m, tm.m, char_m);
auto font = state->getFont(); auto font = state->getFont();
double bbox[4] {0, 0, ax, ay}; double bbox[4] {0, 0, ax, ay};
@ -245,7 +243,7 @@ void DrawingTracer::draw_char(GfxState *state, double x, double y, double ax, do
else else
{//TODO Vertical? {//TODO Vertical?
} }
tm_transform_bbox(tfinal, bbox); tm_transform_bbox(final_m, bbox);
draw_char_bbox(state, bbox); draw_char_bbox(state, bbox);
} }

2
src/HTMLRenderer/HTMLRenderer.h
View File

@ -20,8 +20,6 @@
#include <GfxFont.h> #include <GfxFont.h>
#include <Annot.h> #include <Annot.h>
#include <cairo.h>
#include "pdf2htmlEX-config.h" #include "pdf2htmlEX-config.h"
#include "Param.h" #include "Param.h"