From: cristy Date: Sat, 28 Jan 2012 19:38:34 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6304 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eed6cb663d33342848fce694ad45fe2db637547f;p=imagemagick --- diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 96fe819e1..a0e53e2b7 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -505,7 +505,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image) case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - (void) gzerror(image->blob->file,&status); + (void) gzerror((gzFile) image->blob->file,&status); #endif break; } @@ -546,7 +546,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image) case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - status=gzclose(image->blob->file); + status=gzclose((gzFile) image->blob->file); #endif break; } @@ -2761,12 +2761,13 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length, { default: { - count=(ssize_t) gzread(image->blob->file,q,(unsigned int) length); + count=(ssize_t) gzread((gzFile) image->blob->file,q,(unsigned int) + length); break; } case 2: { - c=gzgetc(image->blob->file); + c=gzgetc((gzFile) image->blob->file); if (c == EOF) break; *q++=(unsigned char) c; @@ -2774,7 +2775,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length, } case 1: { - c=gzgetc(image->blob->file); + c=gzgetc((gzFile) image->blob->file); if (c == EOF) break; *q++=(unsigned char) c; @@ -3517,7 +3518,7 @@ MagickExport MagickOffsetType SeekBlob(Image *image, case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - if (gzseek(image->blob->file,(off_t) offset,whence) < 0) + if (gzseek((gzFile) image->blob->file,(off_t) offset,whence) < 0) return(-1); #endif image->blob->offset=TellBlob(image); @@ -3781,7 +3782,7 @@ static int SyncBlob(Image *image) case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - status=gzflush(image->blob->file,Z_SYNC_FLUSH); + status=gzflush((gzFile) image->blob->file,Z_SYNC_FLUSH); #endif break; } @@ -3855,7 +3856,7 @@ MagickExport MagickOffsetType TellBlob(const Image *image) case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - offset=(MagickOffsetType) gztell(image->blob->file); + offset=(MagickOffsetType) gztell((gzFile) image->blob->file); #endif break; } @@ -4004,20 +4005,20 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, { default: { - count=(ssize_t) gzwrite(image->blob->file,(void *) data, + count=(ssize_t) gzwrite((gzFile) image->blob->file,(void *) data, (unsigned int) length); break; } case 2: { - c=gzputc(image->blob->file,(int) *p++); + c=gzputc((gzFile) image->blob->file,(int) *p++); if (c == EOF) break; count++; } case 1: { - c=gzputc(image->blob->file,(int) *p++); + c=gzputc((gzFile) image->blob->file,(int) *p++); if (c == EOF) break; count++; diff --git a/images/logo-sm-flop.png b/images/logo-sm-flop.png index 0c4960443..f80b94bea 100644 Binary files a/images/logo-sm-flop.png and b/images/logo-sm-flop.png differ diff --git a/images/logo-sm-fx.png b/images/logo-sm-fx.png index 7812b6bc0..385f874b3 100644 Binary files a/images/logo-sm-fx.png and b/images/logo-sm-fx.png differ diff --git a/images/logo-sm.png b/images/logo-sm.png index 49b8e0c82..cbdbc4ae9 100644 Binary files a/images/logo-sm.png and b/images/logo-sm.png differ diff --git a/index.html b/index.html index 13d67809e..b62c2029e 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ - + @@ -29,24 +29,33 @@ + + + + + + + + + + + + + + + + + + + - - - - - @@ -153,57 +162,62 @@ Links
-
+
Sponsors: - - [sponsor] + [sponsor] + [sponsor]
-