From 88d5a5b0ca6d3b169d4479d0a2ba21a8b8b11ab9 Mon Sep 17 00:00:00 2001 From: Deepak Thukral Date: Fri, 22 Feb 2013 10:06:13 +0100 Subject: [PATCH 1/2] process_outline 0 was trying to write manifest which did not exists. --- src/HTMLRenderer/general.cc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 9edf4ae..5bc6d1f 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -348,8 +348,12 @@ void HTMLRenderer::pre_process(PDFDoc * doc) void HTMLRenderer::post_process(void) { dump_css(); - // close files - f_outline.fs.close(); + // close files if they opened + // it's better to brace single liner LLVM complains + if (param->process_outline) + { + f_outline.fs.close(); + } f_pages.fs.close(); f_css.fs.close(); @@ -407,11 +411,14 @@ void HTMLRenderer::post_process(void) } else if (line == "$outline") { - ifstream fin(f_outline.path, ifstream::binary); - if(!fin) - throw "Cannot open read the pages"; - output << fin.rdbuf(); - output.clear(); // output will set fail big if fin is empty + if (param->process_outline) + { + ifstream fin(f_outline.path, ifstream::binary); + if(!fin) + throw "Cannot open read the pages"; + output << fin.rdbuf(); + output.clear(); // output will set fail big if fin is empty + } } else if (line == "$pages") { From a22857b8ef43137653b6ceac1ac641508a1ed2e0 Mon Sep 17 00:00:00 2001 From: Deepak Thukral Date: Fri, 22 Feb 2013 10:11:27 +0100 Subject: [PATCH 2/2] better error messages. --- src/HTMLRenderer/general.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 5bc6d1f..a1cdbfd 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -415,7 +415,7 @@ void HTMLRenderer::post_process(void) { ifstream fin(f_outline.path, ifstream::binary); if(!fin) - throw "Cannot open read the pages"; + throw "Cannot open outline for reading"; output << fin.rdbuf(); output.clear(); // output will set fail big if fin is empty } @@ -424,7 +424,7 @@ void HTMLRenderer::post_process(void) { ifstream fin(f_pages.path, ifstream::binary); if(!fin) - throw "Cannot open read the pages"; + throw "Cannot open pages for reading"; output << fin.rdbuf(); output.clear(); // output will set fail big if fin is empty }