1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 04:50:09 +00:00

clean code

This commit is contained in:
Lu Wang 2012-09-04 12:54:47 +08:00
parent 0cfd146173
commit aed5f3ba04

View File

@ -394,11 +394,6 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
CharCode code; CharCode code;
Unicode *u = nullptr; Unicode *u = nullptr;
double fs = state->getFontSize();
double cs = state->getCharSpace();
double ws = state->getWordSpace();
double hs = state->getHorizScaling();
while (len > 0) { while (len > 0) {
auto n = font->getNextChar(p, len, &code, &u, &uLen, &dx1, &dy1, &ox, &oy); auto n = font->getNextChar(p, len, &code, &u, &uLen, &dx1, &dy1, &ox, &oy);
@ -423,15 +418,17 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
len -= n; len -= n;
} }
double hs = state->getHorizScaling();
// horiz_scaling is merged into ctm now, // horiz_scaling is merged into ctm now,
// so the coordinate system is ugly // so the coordinate system is ugly
dx = (dx * fs + nChars * cs + nSpaces * ws) * hs; dx = (dx * cur_font_size + nChars * cur_letter_space + nSpaces * cur_word_space) * hs;
dy *= fs; dy *= cur_font_size;
cur_tx += dx; cur_tx += dx;
cur_ty += dy; cur_ty += dy;
draw_tx += dx + dxerr * state->getFontSize() * state->getHorizScaling(); draw_tx += dx + dxerr * cur_font_size * hs;
draw_ty += dy; draw_ty += dy;
} }