CVS commit by mueller: 

fix checks again


  M +4 -4      Catalog.cc   1.8
  M +6 -6      XRef.cc   1.8


--- kdegraphics/kpdf/xpdf/Catalog.cc  #1.7:1.8
@@ -66,6 +66,6 @@ Catalog::Catalog(XRef *xrefA) {
   pagesSize = numPages0 = (int)obj.getNum();
   obj.free();
-  if ((pagesSize >= INT_MAX / (signed) sizeof(Page *)) ||
-      (pagesSize >= INT_MAX / (signed) sizeof(Ref)))
+  if (((unsigned) pagesSize >= INT_MAX / sizeof(Page *)) ||
+      ((unsigned) pagesSize >= INT_MAX / sizeof(Ref)))
   {
     error(-1, "Invalid 'pagesSize'");
@@ -201,6 +201,6 @@ int Catalog::readPageTree(Dict *pagesDic
       if (start >= pagesSize) {
         pagesSize += 32;
-        if (pagesSize >= INT_MAX / (signed) sizeof(Page*) ||
-            pagesSize >= INT_MAX / (signed) sizeof(Ref)) {
+        if ((unsigned) pagesSize >= INT_MAX / sizeof(Page*) ||
+            (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) {
           error(-1, "Invalid 'pagesSize' parameter.");
           goto err3;

--- kdegraphics/kpdf/xpdf/XRef.cc  #1.7:1.8
@@ -112,5 +112,5 @@ ObjectStream::ObjectStream(XRef *xref, i
   }
 
-  if (nObjects >= INT_MAX / (signed) sizeof(int)) {
+  if ((unsigned) nObjects >= INT_MAX / sizeof(int)) {
     error(-1, "Invalid 'nObjects'");
     goto err1;
@@ -395,5 +395,5 @@ GBool XRef::readXRefTable(Parser *parser
         goto err1;
       }
-      if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
+      if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
         error(-1, "Invalid 'obj' parameters'");
         goto err1;
@@ -505,5 +505,5 @@ GBool XRef::readXRefStream(Stream *xrefS
   }
   if (newSize > size) {
-    if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
+    if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
       error(-1, "Invalid 'size' parameter.");
       return gFalse;
@@ -599,5 +599,5 @@ GBool XRef::readXRefStreamSection(Stream
       return gFalse;
     }
-    if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
+    if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
       error(-1, "Invalid 'size' inside xref table.");
       return gFalse;
@@ -738,5 +738,5 @@ GBool XRef::constructXRef() {
                     return gFalse;
                   }
-                  if (newSize >= INT_MAX / (signed) sizeof(XRefEntry)) {
+                  if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
                     error(-1, "Invalid 'obj' parameters.");
                     return gFalse;
@@ -765,5 +765,5 @@ GBool XRef::constructXRef() {
       if (streamEndsLen == streamEndsSize) {
         streamEndsSize += 64;
-        if (streamEndsSize >= INT_MAX / (signed) sizeof(int)) {
+        if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) {
           error(-1, "Invalid 'endstream' parameter.");
           return gFalse;