From 793c781e2b7ecbee1472e3f92636b6daad915b6a Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Thu, 4 Apr 2013 15:31:15 +0800 Subject: [PATCH] .. --- src/HTMLRenderer/general.cc | 11 +---------- src/HTMLRenderer/state.cc | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 196ba07..a280d75 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -237,8 +237,6 @@ void HTMLRenderer::pre_process(PDFDoc * doc) * determine scale factors */ { - double zoom = 1.0; - vector zoom_factors; if(is_positive(param->zoom)) @@ -256,14 +254,7 @@ void HTMLRenderer::pre_process(PDFDoc * doc) zoom_factors.push_back((param->fit_height) / preprocessor.get_max_height()); } - if(zoom_factors.empty()) - { - zoom = 1.0; - } - else - { - zoom = *min_element(zoom_factors.begin(), zoom_factors.end()); - } + double zoom = (zoom_factors.empty() ? 1.0 : (*min_element(zoom_factors.begin(), zoom_factors.end()))); text_scale_factor1 = max(zoom, param->font_size_multiplier); text_scale_factor2 = zoom / text_scale_factor1; diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc index bfb1aa7..e181418 100644 --- a/src/HTMLRenderer/state.cc +++ b/src/HTMLRenderer/state.cc @@ -1,7 +1,7 @@ /* * state.cc * - * track current state + * track PDF states * * Copyright (C) 2012,2013 Lu Wang */