From 7497f4855688a5180c7f9cdf23100d8fa206442c Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 8 Dec 2011 01:57:31 +0000 Subject: [PATCH] --- MagickCore/display.c | 1 + MagickCore/resize.c | 2 +- MagickWand/mogrify.c | 3 +-- PerlMagick/Magick.xs | 46 ++++++++++++++--------------------------- PerlMagick/demo/demo.pl | 12 +++++------ coders/msl.c | 1 + 6 files changed, 25 insertions(+), 40 deletions(-) diff --git a/MagickCore/display.c b/MagickCore/display.c index ec0724400..f9024f5f2 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -82,6 +82,7 @@ #include "MagickCore/resource_.h" #include "MagickCore/shear.h" #include "MagickCore/segment.h" +#include "MagickCore/statistic.h" #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/transform.h" diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 5525ef32f..35d6d0668 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -2838,7 +2838,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, scanline=(MagickRealType *) AcquireQuantumMemory((size_t) image->columns, GetPixelChannels(image)*sizeof(*scanline)); scale_scanline=(MagickRealType *) AcquireQuantumMemory((size_t) - scale_image->columns,GetPixelChannels(scale_image)*sizeof(*scale_scanline)); + scale_image->columns,GetPixelChannels(image)*sizeof(*scale_scanline)); y_vector=(MagickRealType *) AcquireQuantumMemory((size_t) image->columns, GetPixelChannels(image)*sizeof(*y_vector)); if ((scanline == (MagickRealType *) NULL) || diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index b6d6d3f21..121bb49b8 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -2160,8 +2160,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; mogrify_image=MotionBlurImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi, - exception); + geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); break; } break; diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 4c70be038..2dc94d6a1 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -7199,18 +7199,16 @@ Mogrify(ref,...) LevelImageColors = 258 Clamp = 259 ClampImage = 260 - BrightnessContrast = 263 - BrightnessContrastImage = 264 - Morphology = 265 - MorphologyImage = 266 - Sans = 267 - SansImage = 268 - Color = 269 - ColorImage = 270 - Mode = 271 - ModeImage = 272 - Statistic = 273 - StatisticImage = 274 + BrightnessContrast = 261 + BrightnessContrastImage = 262 + Morphology = 263 + MorphologyImage = 264 + Color = 265 + ColorImage = 266 + Mode = 267 + ModeImage = 268 + Statistic = 269 + StatisticImage = 270 MogrifyRegion = 666 PPCODE: { @@ -10238,20 +10236,6 @@ Mogrify(ref,...) color_matrix=(double *) RelinquishMagickMemory(color_matrix); break; } - case 134: /* SANS */ - case 135: /* Color */ - { - PixelInfo - color; - - (void) QueryColorCompliance("none",AllCompliance,&color, - exception); - if (attribute_flag[0] != 0) - (void) QueryColorCompliance(argument_list[0].string_reference, - AllCompliance,&color,exception); - (void) SetImageColor(image,&color,exception); - break; - } case 109: /* Mask */ { if (attribute_flag[0] == 0) @@ -10716,7 +10700,7 @@ Mogrify(ref,...) (void) SetPixelChannelMask(image,channel_mask); break; } - case 132: /* BrightnessContrast */ + case 131: /* BrightnessContrast */ { double brightness, @@ -10743,7 +10727,7 @@ Mogrify(ref,...) (void) SetPixelChannelMask(image,channel_mask); break; } - case 133: /* Morphology */ + case 132: /* Morphology */ { KernelInfo *kernel; @@ -10766,7 +10750,7 @@ Mogrify(ref,...) method=argument_list[2].integer_reference; iterations=1; if (attribute_flag[3] != 0) - iterations=argument_list[4].integer_reference; + iterations=argument_list[3].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=MorphologyImage(image,method,iterations,kernel,exception); if (image != (Image *) NULL) @@ -10774,7 +10758,7 @@ Mogrify(ref,...) kernel=DestroyKernelInfo(kernel); break; } - case 136: /* Mode */ + case 133: /* Mode */ { if (attribute_flag[0] != 0) { @@ -10796,7 +10780,7 @@ Mogrify(ref,...) (void) SetPixelChannelMask(image,channel_mask); break; } - case 137: /* Statistic */ + case 134: /* Statistic */ { StatisticType statistic; diff --git a/PerlMagick/demo/demo.pl b/PerlMagick/demo/demo.pl index f29df85e5..b56e39654 100644 --- a/PerlMagick/demo/demo.pl +++ b/PerlMagick/demo/demo.pl @@ -247,13 +247,13 @@ push(@$images,$example); print "Median Filter...\n"; $example=$model->Clone(); $example->Label('Median Filter'); -$example->MedianFilter('3x3'); +$example->MedianFilter('4x4'); push(@$images,$example); print "Mode...\n"; $example=$model->Clone(); $example->Label('Mode'); -$example->Mode(); +$example->Mode('4x4'); push(@$images,$example); print "Modulate...\n"; @@ -272,7 +272,7 @@ push(@$images,$example); print "Morphology...\n"; $example=$model->Clone(); $example->Label('Morphology'); -$example->Morphology(method=>'Dilate',kernel=>'Diamond',iterations=>3); +$example->Morphology(method=>'Dilate',kernel=>'Diamond',iterations=>2); push(@$images,$example); print "Motion Blur...\n"; @@ -296,7 +296,7 @@ push(@$images,$example); print "Oil Paint...\n"; $example=$model->Clone(); $example->Label('Oil Paint'); -$example->OilPaint(); +$example->OilPaint('2x0.5'); push(@$images,$example); print "Plasma...\n"; @@ -340,7 +340,7 @@ push(@$images,$example); print "Reduce Noise...\n"; $example=$model->Clone(); $example->Label('Reduce Noise'); -$example->ReduceNoise(); +$example->ReduceNoise('2x2'); push(@$images,$example); print "Resize...\n"; @@ -370,7 +370,7 @@ push(@$images,$example); print "Scale...\n"; $example=$model->Clone(); $example->Label('Scale'); -#$example->Scale('60%'); +$example->Scale('60%'); push(@$images,$example); print "Segment...\n"; diff --git a/coders/msl.c b/coders/msl.c index bdb9a5093..3e5f8fe23 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -83,6 +83,7 @@ #include "MagickCore/segment.h" #include "MagickCore/shear.h" #include "MagickCore/signature.h" +#include "MagickCore/statistic.h" #include "MagickCore/static.h" #include "MagickCore/string_.h" #include "MagickCore/string-private.h" -- 2.40.0