From eed6cb663d33342848fce694ad45fe2db637547f Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 28 Jan 2012 19:38:34 +0000 Subject: [PATCH] --- MagickCore/blob.c | 23 +- images/logo-sm-flop.png | Bin 8950 -> 8950 bytes images/logo-sm-fx.png | Bin 11656 -> 11656 bytes images/logo-sm.png | Bin 9009 -> 9009 bytes index.html | 137 +++-- www/ImageMagickObject.html | 133 +++-- www/advanced-unix-installation.html | 177 ++++--- www/advanced-windows-installation.html | 143 ++--- www/animate.html | 127 +++-- www/api.html | 123 +++-- www/api/animate.html | 123 +++-- www/api/annotate.html | 123 +++-- www/api/attribute.html | 123 +++-- www/api/blob.html | 123 +++-- www/api/cache-view.html | 123 +++-- www/api/cache.html | 123 +++-- www/api/cipher.html | 123 +++-- www/api/color.html | 135 +++-- www/api/colormap.html | 121 +++-- www/api/compare.html | 123 +++-- www/api/composite.html | 123 +++-- www/api/constitute.html | 123 +++-- www/api/decorate.html | 123 +++-- www/api/deprecate.html | 150 ++++-- www/api/display.html | 123 +++-- www/api/distort.html | 173 ++++-- www/api/draw.html | 125 +++-- www/api/drawing-wand.html | 123 +++-- www/api/effect.html | 163 +++--- www/api/enhance.html | 123 +++-- www/api/exception.html | 123 +++-- www/api/feature.html | 123 +++-- www/api/fourier.html | 123 +++-- www/api/fx.html | 123 +++-- www/api/histogram.html | 123 +++-- www/api/image-view.html | 123 +++-- www/api/image.html | 125 +++-- www/api/layer.html | 123 +++-- www/api/list.html | 123 +++-- www/api/magick-deprecate.html | 123 +++-- www/api/magick-image.html | 128 +++-- www/api/magick-property.html | 123 +++-- www/api/magick-wand.html | 123 +++-- www/api/magick.html | 129 +++-- www/api/memory.html | 123 +++-- www/api/module.html | 123 +++-- www/api/mogrify.html | 130 +++-- www/api/monitor.html | 123 +++-- www/api/montage.html | 121 +++-- www/api/morphology.html | 123 +++-- www/api/paint.html | 123 +++-- www/api/pixel-iterator.html | 123 +++-- www/api/pixel-wand.html | 123 +++-- www/api/profile.html | 123 +++-- www/api/property.html | 123 +++-- www/api/quantize.html | 123 +++-- www/api/registry.html | 123 +++-- www/api/resize.html | 123 +++-- www/api/resource.html | 123 +++-- www/api/segment.html | 123 +++-- www/api/shear.html | 190 ++++--- www/api/signature.html | 123 +++-- www/api/statistic.html | 161 ++++-- www/api/stream.html | 123 +++-- www/api/transform.html | 127 +++-- www/api/version.html | 123 +++-- www/api/wand-view.html | 123 +++-- www/architecture.html | 187 ++++--- www/binary-releases.html | 238 +++++---- www/changelog.html | 425 +++++++++++---- www/cipher.html | 129 +++-- www/color.html | 125 +++-- www/command-line-options.html | 420 +++++++++------ www/command-line-processing.html | 201 +++---- www/command-line-tools.html | 123 +++-- www/compare.html | 133 +++-- www/compose.html | 127 +++-- www/composite.html | 129 +++-- www/conjure.html | 125 +++-- www/contact.html | 126 +++-- www/convert.html | 129 +++-- www/display.html | 129 +++-- www/download.html | 138 +++-- www/escape.html | 153 +++--- www/examples.html | 123 +++-- www/exception.html | 123 +++-- www/export.html | 123 +++-- www/formats.html | 149 +++--- www/fx.html | 167 +++--- www/high-dynamic-range.html | 127 +++-- www/identify.html | 135 +++-- www/import.html | 127 +++-- www/index.html | 137 +++-- www/install-source.html | 154 +++--- www/jp2.html | 131 +++-- www/license.html | 125 +++-- www/links.html | 139 +++-- www/magick++.html | 123 +++-- www/magick-core.html | 127 +++-- www/magick-vector-graphics.html | 129 +++-- www/magick-wand.html | 126 +++-- www/miff.html | 121 +++-- www/mogrify.html | 129 +++-- www/montage.html | 127 +++-- www/motion-picture.html | 129 +++-- www/parallel.html | 302 +++++++++++ www/perl-magick.html | 165 +++--- www/porting.html | 189 ++++--- www/quantize.html | 123 +++-- www/resources.html | 155 +++--- www/search.html | 123 +++-- www/sitemap.html | 126 +++-- www/source/analyze.c | 2 +- www/source/coder.xml | 144 +---- www/source/colors.xml | 698 +------------------------ www/source/configure.xml | 39 +- www/source/delegates.xml | 63 +-- www/source/english.xml | 330 +++++++----- www/source/francais.xml | 60 ++- www/source/magic.xml | 115 +--- www/source/mgk.c | 2 +- www/source/policy.xml | 8 +- www/source/thresholds.xml | 115 +++- www/source/type.xml | 2 +- www/sponsors.html | 159 +++--- www/stream.html | 129 +++-- www/subversion.html | 133 +++-- www/t-shirt.html | 123 +++-- 128 files changed, 10063 insertions(+), 7180 deletions(-) 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 0c49604433921a9a2c202e9d115206d4bfa38c03..f80b94beadd538f96f9820c23dd84cca6bae6ff9 100644 GIT binary patch delta 13 Ucmez7`ptC%mlC7lWNxL`04Wd!FaQ7m delta 13 Ucmez7`ptC%mlC7VWNxL`04Ws(F#rGn diff --git a/images/logo-sm-fx.png b/images/logo-sm-fx.png index 7812b6bc0e3f85d891f6131af5ac9e7d181f75f7..385f874b3e4a0c0742c260e45d4a6acb0698c88c 100644 GIT binary patch delta 13 UcmeB(?ugznM~BgH@?4$Q04GERxBvhE delta 13 UcmeB(?ugznM~Bg9@?4$Q04GTWxc~qF diff --git a/images/logo-sm.png b/images/logo-sm.png index 49b8e0c82ff52de5221ca2e2ff7b20de453ef6cd..cbdbc4ae960d9e3415734341096ff9bc70487701 100644 GIT binary patch delta 13 Ucmdn!w$W{as}iH(WH+VP03|mC9smFU delta 13 Ucmdn!w$W{as}iHpWH+VP03|#H9{>OV 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]
-