From 6746a3a0ab316d8273b311bf6ce16c03d3e4932a Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Sun, 7 Apr 2013 17:14:51 +0800 Subject: [PATCH] .. --- src/HTMLTextPage.cc | 22 ++++------------------ src/HTMLTextPage.h | 1 - 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/HTMLTextPage.cc b/src/HTMLTextPage.cc index fa8eb3d..780b0fa 100644 --- a/src/HTMLTextPage.cc +++ b/src/HTMLTextPage.cc @@ -6,8 +6,6 @@ * Copyright (C) 2013 Lu Wang */ -#include - #include "HTMLTextPage.h" namespace pdf2htmlEX { @@ -23,7 +21,10 @@ HTMLTextPage::HTMLTextPage(const Param & param, AllStateManager & all_manager) void HTMLTextPage::dump_text(ostream & out) { - prepare(); + for(auto iter = text_lines.begin(); iter != text_lines.end(); ++iter) + (*iter)->prepare(); + if(param.optimize_text) + optimize(); for(auto iter = text_lines.begin(); iter != text_lines.end(); ++iter) (*iter)->dump_text(out); } @@ -74,21 +75,6 @@ void HTMLTextPage::open_new_line(void) } } -static bool is_text_line_empty(const unique_ptr& p) -{ - return p->empty(); -} - -void HTMLTextPage::prepare(void) -{ - // remove empty lines - text_lines.erase(remove_if(text_lines.begin(), text_lines.end(), is_text_line_empty), text_lines.end()); - for(auto iter = text_lines.begin(); iter != text_lines.end(); ++iter) - (*iter)->prepare(); - if(param.optimize_text) - optimize(); -} - void HTMLTextPage::optimize(void) { //TODO diff --git a/src/HTMLTextPage.h b/src/HTMLTextPage.h index 8d441a8..dcd2559 100644 --- a/src/HTMLTextPage.h +++ b/src/HTMLTextPage.h @@ -39,7 +39,6 @@ public: void open_new_line(void); private: - void prepare(void); void optimize(void); const Param & param;