[poppler] poppler/poppler: Annot.cc,1.4,1.5 JBIG2Stream.cc,1.5,1.6

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv29674/poppler

Modified Files:
	Annot.cc JBIG2Stream.cc 
Log Message:
Jeff Muizelaar's improvements to my yesterday's small patches


Index: Annot.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Annot.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Annot.cc	18 Jan 2006 22:32:13 -0000	1.4
+++ Annot.cc	6 Feb 2006 18:50:11 -0000	1.5
@@ -211,15 +211,14 @@
 
     // build the appearance stream dictionary
     appearDict.initDict(xref);
-    appearDict.dictAdd(copyString("Length"),
-		       obj1.initInt(appearBuf->getLength()));
-    appearDict.dictAdd(copyString("Subtype"), obj1.initName("Form"));
+    appearDict.dictAdd("Length", obj1.initInt(appearBuf->getLength()));
+    appearDict.dictAdd("Subtype", obj1.initName("Form"));
     obj1.initArray(xref);
     obj1.arrayAdd(obj2.initReal(0));
     obj1.arrayAdd(obj2.initReal(0));
     obj1.arrayAdd(obj2.initReal(xMax - xMin));
     obj1.arrayAdd(obj2.initReal(yMax - yMin));
-    appearDict.dictAdd(copyString("BBox"), &obj1);
+    appearDict.dictAdd("BBox", &obj1);
 
     // find the resource dictionary
     dict->lookup("DR", &drObj);
@@ -244,7 +243,7 @@
       }
     }
     if (drObj.isDict()) {
-      appearDict.dictAdd(copyString("Resources"), drObj.copy(&obj1));
+      appearDict.dictAdd("Resources", drObj.copy(&obj1));
     }
     drObj.free();
 

Index: JBIG2Stream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/JBIG2Stream.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- JBIG2Stream.cc	5 Feb 2006 15:46:10 -0000	1.5
+++ JBIG2Stream.cc	6 Feb 2006 18:50:11 -0000	1.6
@@ -2325,7 +2325,7 @@
     error(getPos(), "Bad size in JBIG2 halftone segment");
     return;
   }
-  if (h < 0 || w == 0 || h >= INT_MAX / w) {
+  if (w == 0 || h >= INT_MAX / w) {
      error(getPos(), "Bad size in JBIG2 bitmap segment");
     return;
   }