DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-07-07 18:30:34 +00:00
Code

rounding float point numbers

Browse Source
This commit is contained in:
Lu Wang 2012-09-14 15:18:29 +08:00
parent 4a5c3e1d3e
commit ec57ec7ef3
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/HTMLRenderer/export.cc
View File

@ -35,7 +35,7 @@ void HTMLRenderer::export_remote_font(const FontInfo & info, const string & suff
} }
} }
css_fout << ")format(\"" << fontfileformat << "\");}.f" << info.id << "{font-family:f" << info.id << ";line-height:" << (info.ascent - info.descent) << ";}" << endl; css_fout << ")format(\"" << fontfileformat << "\");}.f" << info.id << "{font-family:f" << info.id << ";line-height:" << _round(info.ascent - info.descent) << ";}" << endl;
} }
static string general_font_family(GfxFont * font) static string general_font_family(GfxFont * font)
@ -71,14 +71,14 @@ void HTMLRenderer::export_local_font(const FontInfo & info, GfxFont * font, cons
else if(font->isItalic() || (fn.find("italic") != string::npos)) else if(font->isItalic() || (fn.find("italic") != string::npos))
css_fout << "font-style:italic;"; css_fout << "font-style:italic;";
css_fout << "line-height:" << (info.ascent - info.descent) << ";"; css_fout << "line-height:" << _round(info.ascent - info.descent) << ";";
css_fout << "}" << endl; css_fout << "}" << endl;
} }
void HTMLRenderer::export_font_size (long long fs_id, double font_size) void HTMLRenderer::export_font_size (long long fs_id, double font_size)
{ {
css_fout << ".s" << fs_id << "{font-size:" << font_size << "px;}" << endl; css_fout << ".s" << fs_id << "{font-size:" << _round(font_size) << "px;}" << endl;
} }
void HTMLRenderer::export_transform_matrix (long long tm_id, const double * tm) void HTMLRenderer::export_transform_matrix (long long tm_id, const double * tm)
@ -95,10 +95,10 @@ void HTMLRenderer::export_transform_matrix (long long tm_id, const double * tm)
const auto & prefix = *iter; const auto & prefix = *iter;
// PDF use a different coordinate system from Web // PDF use a different coordinate system from Web
css_fout << prefix << "transform:matrix(" css_fout << prefix << "transform:matrix("
<< tm[0] << ',' << _round(tm[0]) << ','
<< -tm[1] << ',' << _round(-tm[1]) << ','
<< -tm[2] << ',' << _round(-tm[2]) << ','
<< tm[3] << ','; << _round(tm[3]) << ',';
css_fout << "0,0);"; css_fout << "0,0);";
} }
@ -107,12 +107,12 @@ void HTMLRenderer::export_transform_matrix (long long tm_id, const double * tm)
void HTMLRenderer::export_letter_space (long long ls_id, double letter_space) void HTMLRenderer::export_letter_space (long long ls_id, double letter_space)
{ {
css_fout << ".l" << ls_id << "{letter-spacing:" << letter_space << "px;}" << endl; css_fout << ".l" << ls_id << "{letter-spacing:" << _round(letter_space) << "px;}" << endl;
} }
void HTMLRenderer::export_word_space (long long ws_id, double word_space) void HTMLRenderer::export_word_space (long long ws_id, double word_space)
{ {
css_fout << ".w" << ws_id << "{word-spacing:" << word_space << "px;}" << endl; css_fout << ".w" << ws_id << "{word-spacing:" << _round(word_space) << "px;}" << endl;
} }
void HTMLRenderer::export_color (long long color_id, const GfxRGB * rgb) void HTMLRenderer::export_color (long long color_id, const GfxRGB * rgb)
@ -125,14 +125,14 @@ void HTMLRenderer::export_color (long long color_id, const GfxRGB * rgb)
void HTMLRenderer::export_whitespace (long long ws_id, double ws_width) void HTMLRenderer::export_whitespace (long long ws_id, double ws_width)
{ {
if(ws_width > 0) if(ws_width > 0)
css_fout << "._" << ws_id << "{display:inline-block;width:" << ws_width << "px;}" << endl; css_fout << "._" << ws_id << "{display:inline-block;width:" << _round(ws_width) << "px;}" << endl;
else else
css_fout << "._" << ws_id << "{display:inline;margin-left:" << ws_width << "px;}" << endl; css_fout << "._" << ws_id << "{display:inline;margin-left:" << _round(ws_width) << "px;}" << endl;
} }
void HTMLRenderer::export_rise (long long rise_id, double rise) void HTMLRenderer::export_rise (long long rise_id, double rise)
{ {
css_fout << ".r" << rise_id << "{top:" << (-rise) << "px;}" << endl; css_fout << ".r" << rise_id << "{top:" << _round(-rise) << "px;}" << endl;
} }
} }

2
src/HTMLRenderer/general.cc
View File

@ -311,7 +311,7 @@ void HTMLRenderer::endPage() {
void HTMLRenderer::fix_stream (std::ostream & out) void HTMLRenderer::fix_stream (std::ostream & out)
{ {
out << fixed << hex; out << hex;
} }
void HTMLRenderer::add_tmp_file(const string & fn) void HTMLRenderer::add_tmp_file(const string & fn)

1
src/include/util.h
View File

@ -48,6 +48,7 @@ namespace
} }
} }
static inline double _round(double x) { return (std::abs(x) > EPS) ? x : 0.0; }
static inline bool _equal(double x, double y) { return std::abs(x-y) < EPS; } static inline bool _equal(double x, double y) { return std::abs(x-y) < EPS; }
static inline bool _is_positive(double x) { return x > EPS; } static inline bool _is_positive(double x) { return x > EPS; }
static inline bool _tm_equal(const double * tm1, const double * tm2, int size = 6) static inline bool _tm_equal(const double * tm1, const double * tm2, int size = 6)