From 787d43596c4afbd97079e154225c49e47da6b161 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 6 Mar 2010 13:55:58 +0000 Subject: [PATCH] --- coders/jpeg.c | 32 ++++++++- www/ImageMagickObject.html | 2 +- www/advanced-unix-installation.html | 4 +- www/advanced-windows-installation.html | 2 +- www/animate.html | 2 +- www/api.html | 44 ++++++------ www/api/animate.html | 2 +- www/api/annotate.html | 4 +- www/api/attribute.html | 2 +- www/api/blob.html | 3 + www/api/cache-view.html | 3 + www/api/cache.html | 4 +- www/api/cipher.html | 4 +- www/api/color.html | 4 +- www/api/colormap.html | 2 +- www/api/compare.html | 5 +- www/api/decorate.html | 4 +- www/api/deprecate.html | 2 +- www/api/display.html | 2 +- www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 4 +- www/api/enhance.html | 2 +- www/api/exception.html | 4 +- www/api/feature.html | 3 - www/api/fx.html | 3 + www/api/histogram.html | 4 +- www/api/layer.html | 2 +- www/api/list.html | 2 +- www/api/magick-image.html | 4 +- www/api/magick-property.html | 3 + www/api/magick-wand.html | 2 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/module.html | 4 +- www/api/montage.html | 4 +- www/api/morphology.html | 4 +- www/api/paint.html | 2 +- www/api/pixel-iterator.html | 4 +- www/api/pixel-view.html | 2 +- www/api/pixel-wand.html | 2 +- www/api/profile.html | 3 - www/api/property.html | 3 - www/api/registry.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 3 + www/api/signature.html | 4 +- www/api/stream.html | 3 - www/api/transform.html | 2 +- www/api/version.html | 4 +- www/architecture.html | 2 +- www/binary-releases.html | 5 +- www/changelog.html | 2 +- www/cipher.html | 4 +- www/color.html | 5 +- www/command-line-options.html | 51 +++++++++---- www/command-line-tools.html | 8 +-- www/compare.html | 2 +- www/composite.html | 2 +- www/contact.html | 6 +- www/convert.html | 3 - www/display.html | 2 +- www/download.html | 2 +- www/escape.html | 2 +- www/examples.html | 2 +- www/exception.html | 2 +- www/fx.html | 2 +- www/high-dynamic-range.html | 4 +- www/history.html | 5 +- www/identify.html | 5 +- www/install-source.html | 5 +- www/license.html | 2 +- www/links.html | 99 +++++++++++++------------- www/magick-core.html | 3 - www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 2 +- www/miff.html | 5 +- www/mirrors.html | 6 +- www/montage.html | 5 +- www/motion-picture.html | 3 - www/quantize.html | 2 +- www/search.html | 3 - www/sitemap.html | 52 +++++++------- www/subversion.html | 2 +- www/t-shirt.html | 2 +- 86 files changed, 281 insertions(+), 246 deletions(-) diff --git a/coders/jpeg.c b/coders/jpeg.c index 51a64e948..d28d45838 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -811,7 +811,7 @@ static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, jpeg_info->comp_info[2].v_samp_factor, jpeg_info->comp_info[3].h_samp_factor, jpeg_info->comp_info[3].v_samp_factor); - break; + break; } case JCS_GRAYSCALE: { @@ -1052,6 +1052,36 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, if (IsMagickTrue(option) != MagickFalse) jpeg_info.do_block_smoothing=MagickTrue; } + option=GetImageOption(image_info,"jpeg:dct-method"); + if (option != (const char *) NULL) + switch (*option) + { + case 'D': + case 'd': + { + if (LocaleCompare(option,"default") == 0) + jpeg_info.dct_method=JDCT_DEFAULT; + break; + } + case 'F': + case 'f': + { + if (LocaleCompare(option,"fastest") == 0) + jpeg_info.dct_method=JDCT_FASTEST; + if (LocaleCompare(option,"float") == 0) + jpeg_info.dct_method=JDCT_FLOAT; + break; + } + case 'I': + case 'i': + { + if (LocaleCompare(option,"ifast") == 0) + jpeg_info.dct_method=JDCT_IFAST; + if (LocaleCompare(option,"islow") == 0) + jpeg_info.dct_method=JDCT_ISLOW; + break; + } + } option=GetImageOption(image_info,"jpeg:fancy-upsampling"); if (option != (const char *) NULL) { diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index f3f8457e8..6a0ccd16e 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -125,7 +125,7 @@