From b21042021b748579595511370d2400a41e85aeb0 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 15 Aug 2012 14:27:59 +0800 Subject: [PATCH] clean code, working on tmp_dir --- src/Consts.cc | 4 +--- src/Consts.h | 9 +-------- src/HTMLRenderer/general.cc | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Consts.cc b/src/Consts.cc index 3467335..991582c 100644 --- a/src/Consts.cc +++ b/src/Consts.cc @@ -12,7 +12,7 @@ using std::string; const double EPS = 1e-6; -const string TMP_DIR="/tmp/pdf2htmlEX"; +const double id_matrix[6] = {1.0, 0.0, 0.0, 1.0, 0.0, 0.0}; const map BASE_14_FONT_CSS_FONT_MAP({ { "Courier", "Courier,monospace" }, @@ -22,8 +22,6 @@ const map BASE_14_FONT_CSS_FONT_MAP({ { "ZapfDingbats", "ZapfDingbats,\"Dingbats\"" }, }); -const double id_matrix[6] = {1.0, 0.0, 0.0, 1.0, 0.0, 0.0}; - const map GB_ENCODED_FONT_NAME_MAP({ {"\xCB\xCE\xCC\xE5", "SimSun"}, {"\xBA\xDA\xCC\xE5", "SimHei"}, diff --git a/src/Consts.h b/src/Consts.h index 8be17bd..4f87166 100644 --- a/src/Consts.h +++ b/src/Consts.h @@ -12,16 +12,9 @@ #include extern const double EPS; - -extern const std::string HTML_HEAD; -extern const std::string HTML_TAIL; - -extern const std::string TMP_DIR; - -extern const std::map BASE_14_FONT_CSS_FONT_MAP; - extern const double id_matrix[6]; +extern const std::map BASE_14_FONT_CSS_FONT_MAP; extern const std::map GB_ENCODED_FONT_NAME_MAP; #endif //CONSTS_H__ diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 7a992fb..fa88d05 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -23,7 +23,7 @@ HTMLRenderer::HTMLRenderer(const Param * param) ,image_count(0) ,param(param) ,dest_dir(param->dest_dir) - ,tmp_dir(TMP_DIR) + ,tmp_dir(param->tmp_dir) { // install default font & size install_font(nullptr);