Attachment 21352 Details for Bug 19218 – patch-3-Fix_compile_warnings_on_signed-unsigned_comparison

[patch] patch-3-Fix_compile_warnings_on_signed-unsigned_comparison

patch-3-Fix_compile_warnings_on_signed-unsigned_comparison (text/plain), 3.39 KB, created by Hib Eris on 2008-12-21 07:53:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2008-12-21 07:53:53 UTC

Size: 3.39 KB

patch

obsolete

>commit db943405923c0fa4b8b9f2f169124ba8b245abf0
>Author: Hib Eris <hib@hiberis.nl>
>Date:   Sun Dec 21 13:52:44 2008 +0100
>
>    Fix compile warnings on signed/unsigned comparison
>
>diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
>index 9ae54e6..949dab1 100644
>--- a/poppler/GfxFont.cc
>+++ b/poppler/GfxFont.cc
>@@ -838,6 +838,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
> 	  // if the 'mapUnknownCharNames' flag is set, do a simple pass-through
> 	  // mapping for unknown character names
> 	  if (charName && charName[0]) {
>+	    size_t n;
> 	    for (n = 0; n < sizeof(uBuf)/sizeof(*uBuf); ++n)
> 	      if (!(uBuf[n] = charName[n]))
> 		break;
>@@ -1057,7 +1058,8 @@ static int parseCharName(char *charName, Unicode *uBuf, int uLen,
>     // restrictions mean that the "uni" prefix can be used only with Unicode
>     // values from the Basic Multilingual Plane (BMP).
>     if (n >= 7 && (n % 4) == 3 && !strncmp(charName, "uni", 3)) {
>-      unsigned int i, m;
>+      int i;
>+      unsigned int m;
>       for (i = 0, m = 3; i < uLen && m < n; m += 4) {
> 	if (isxdigit(charName[m]) && isxdigit(charName[m + 1]) && 
> 	    isxdigit(charName[m + 2]) && isxdigit(charName[m + 3])) {
>diff --git a/poppler/XRef.cc b/poppler/XRef.cc
>index 0e99a3f..df74026 100644
>--- a/poppler/XRef.cc
>+++ b/poppler/XRef.cc
>@@ -129,7 +129,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
>     goto err1;
>   }
> 
>-  if (nObjects*(int)sizeof(int)/sizeof(int) != nObjects) {
>+  if (nObjects*(int)sizeof(int)/(int)sizeof(int) != nObjects) {
>     error(-1, "Invalid 'nObjects'");
>     goto err1;
>   }
>@@ -421,7 +421,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
>       if (newSize < 0) {
> 	goto err1;
>       }
>-      if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+      if (newSize*(int)sizeof(XRefEntry)/(int)sizeof(XRefEntry) != newSize) {
>         error(-1, "Invalid 'obj' parameters'");
>         goto err1;
>       }
>@@ -537,7 +537,7 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
>     goto err1;
>   }
>   if (newSize > size) {
>-    if (newSize * (int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+    if (newSize * (int)sizeof(XRefEntry)/(int)sizeof(XRefEntry) != newSize) {
>       error(-1, "Invalid 'size' parameter.");
>       return gFalse;
>     }
>@@ -634,7 +634,7 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
>     if (newSize < 0) {
>       return gFalse;
>     }
>-    if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+    if (newSize*(int)sizeof(XRefEntry)/(int)sizeof(XRefEntry) != newSize) {
>       error(-1, "Invalid 'size' inside xref table.");
>       return gFalse;
>     }
>@@ -780,7 +780,7 @@ GBool XRef::constructXRef() {
> 		    error(-1, "Bad object number");
> 		    return gFalse;
> 		  }
>-		  if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
>+		  if (newSize*(int)sizeof(XRefEntry)/(int)sizeof(XRefEntry) != newSize) {
> 		    error(-1, "Invalid 'obj' parameters.");
> 		    return gFalse;
> 		  }
>@@ -809,7 +809,7 @@ GBool XRef::constructXRef() {
>     } else if (!strncmp(p, "endstream", 9)) {
>       if (streamEndsLen == streamEndsSize) {
> 	streamEndsSize += 64;
>-        if (streamEndsSize*(int)sizeof(int)/sizeof(int) != streamEndsSize) {
>+        if (streamEndsSize*(int)sizeof(int)/(int)sizeof(int) != streamEndsSize) {
>           error(-1, "Invalid 'endstream' parameter.");
>           return gFalse;
>         }

Actions: View | Splinter Review

Attachments on bug 19218: 21350 | 21351 | 21352 | 21353 | 21354 | 21355 | 21356 | 21405

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.