[poppler] poppler/Annot.cc

[Carlos Garcia Campos]

 poppler/Annot.cc |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 41420bfd88685d9b1ac44dc7444ea3abee92097c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Mon Mar 7 09:18:25 2011 +0100

    annots: Only parse the dash array for dashed borders

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index d0d9798..d6d3b2f 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -563,14 +563,16 @@ AnnotBorderBS::AnnotBorderBS(Dict *dict) {
   obj2.free();
   obj1.free();
 
-  if (dict->lookup("D", &obj1)->isArray())
-    parseDashArray(&obj1);
-  obj1.free();
+  if (style == borderDashed) {
+    if (dict->lookup("D", &obj1)->isArray())
+      parseDashArray(&obj1);
+    obj1.free();
 
-  if (!dash) {
-    dashLength = 1;
-    dash = (double *) gmallocn (dashLength, sizeof (double));
-    dash[0] = 3;
+    if (!dash) {
+      dashLength = 1;
+      dash = (double *) gmallocn (dashLength, sizeof (double));
+      dash[0] = 3;
+    }
   }
 }