X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fglyphs-eimage.c;h=c2958343e470d3a87173d92d52d42529ba4e8b0b;hb=d81014e89b5102527e5b50aac62edeed2955671d;hp=3308449a24fc450a2dba053dd3252be382aa93fd;hpb=1bbdeb3a4ec887b8a6bcacb0384a978cc3b1f6f5;p=chise%2Fxemacs-chise.git- diff --git a/src/glyphs-eimage.c b/src/glyphs-eimage.c index 3308449..c295834 100644 --- a/src/glyphs-eimage.c +++ b/src/glyphs-eimage.c @@ -1123,11 +1123,11 @@ static toff_t tiff_memory_seek(thandle_t data, toff_t off, int whence) break; default: fprintf(stderr,"Eh? invalid seek mode in tiff_memory_seek\n"); - return -1; + return (toff_t) -1; } if ((newidx > mem->len) || (newidx < 0)) - return -1; + return (toff_t) -1; mem->index = newidx; return newidx; @@ -1277,7 +1277,7 @@ tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32)); if (raster != NULL) { - unsigned int i,j; + int i,j; uint32 *rp; ep = unwind.eimage; rp = raster; @@ -1288,7 +1288,7 @@ tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, /* This is to get around weirdness in the libtiff library where properly made TIFFs will come out upside down. libtiff bug or jhod-brainlock? */ rp = raster + (i * width); - for (j = 0; j < width; j++) + for (j = 0; (uint32) j < width; j++) { *ep++ = (unsigned char)TIFFGetR(*rp); *ep++ = (unsigned char)TIFFGetG(*rp);