From e4ea4a975b7dede20d631b84aafb91dc2604e5a9 Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Fri, 7 Sep 2012 08:13:45 +0800
Subject: [PATCH] disable annotation

---
 TODO                        | 2 --
 src/BackgroundRenderer.h    | 7 ++++---
 src/HTMLRenderer/general.cc | 8 +++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index f8905d8..08264c1 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 disable annotation
 
-valgrind
-
 detect duplicate base fonts when embedding
 
 take care of spaces (simulate by <span>)
diff --git a/src/BackgroundRenderer.h b/src/BackgroundRenderer.h
index f8f4034..335184f 100644
--- a/src/BackgroundRenderer.h
+++ b/src/BackgroundRenderer.h
@@ -18,10 +18,11 @@ public:
   BackgroundRenderer(SplashColorMode colorModeA, int bitmapRowPadA,
         GBool reverseVideoA, SplashColorPtr paperColorA,
         GBool bitmapTopDownA = gTrue,
-        GBool allowAntialiasA = gTrue) 
+        GBool allowAntialiasA = gTrue)
       : SplashOutputDev(colorModeA,
-            bitmapRowPadA, reverseVideoA, paperColorA, bitmapTopDownA,
-            allowAntialiasA) { }
+        bitmapRowPadA, reverseVideoA, paperColorA, bitmapTopDownA,
+        allowAntialiasA) 
+  { }
   virtual ~BackgroundRenderer() { }
   
   virtual void drawChar(GfxState *state, double x, double y,
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index 9c293e0..0f6c539 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -19,6 +19,7 @@
 
 using std::fixed;
 using std::flush;
+using std::function;
 using boost::filesystem::remove;
 using boost::filesystem::filesystem_error;
 
@@ -50,6 +51,10 @@ HTMLRenderer::~HTMLRenderer()
     delete [] cur_mapping2;
 }
 
+static GBool annot_cb(Annot *, void *) {
+    return false;
+};
+
 void HTMLRenderer::process(PDFDoc *doc)
 {
     xref = doc->getXRef();
@@ -78,13 +83,14 @@ void HTMLRenderer::process(PDFDoc *doc)
     }
 
     pre_process();
+
     for(int i = param->first_page; i <= param->last_page ; ++i) 
     {
         if(param->process_nontext)
         {
             doc->displayPage(bg_renderer, i, param->h_dpi, param->v_dpi,
                     0, true, false, false,
-                    nullptr, nullptr, nullptr, nullptr);
+                    nullptr, nullptr, &annot_cb, nullptr);
 
             string fn = (format("p%|1$x|.png")%i).str();
             bg_renderer->getBitmap()->writeImgFile(splashFormatPng, (char*)((param->single_html ? tmp_dir : dest_dir) / fn) .c_str(), param->h_dpi, param->v_dpi);