Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2013-01-17 09:42:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2013-01-12 07:51:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2013-01-17 09:42:34.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 15 17:34:50 UTC 2013 - [email protected] + +- fix wrong mean-error output: + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 + * dropped disable-matlab-test.patch + * added ImageMagick-uninitialized-memory.patch + +------------------------------------------------------------------- Old: ---- disable-matlab-test.patch New: ---- ImageMagick-uninitialized-memory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.GxjPP5/_old 2013-01-17 09:42:37.000000000 +0100 +++ /var/tmp/diff_new_pack.GxjPP5/_new 2013-01-17 09:42:37.000000000 +0100 @@ -58,8 +58,9 @@ Patch1: ImageMagick-6.6.8.9-examples.patch Patch2: ImageMagick-6.6.8.9-doc.patch Patch3: ImageMagick-6.7.6.1-no-dist-lzip.patch -# Matlab RGB 8bit LSB test fails with MALLOC_PERTURB_=69 checking -Patch4: disable-matlab-test.patch +# will be upstreamed: +# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 +Patch4: ImageMagick-uninitialized-memory.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -384,6 +385,8 @@ + + ++++++ ImageMagick-uninitialized-memory.patch ++++++ http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 Index: ImageMagick-6.7.8-8/coders/mat.c =================================================================== --- ImageMagick-6.7.8-8.orig/coders/mat.c +++ ImageMagick-6.7.8-8/coders/mat.c @@ -897,7 +897,7 @@ NEXT_FRAME: { for (i = 0; i < (ssize_t) MATLAB_HDR.SizeY; i++) { - q=QueueAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception); + q=GetAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception); if (q == (PixelPacket *)NULL) { if (logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(), Index: ImageMagick-6.7.8-8/magick/quantum-import.c =================================================================== --- ImageMagick-6.7.8-8.orig/magick/quantum-import.c +++ ImageMagick-6.7.8-8/magick/quantum-import.c @@ -1032,62 +1032,86 @@ static void ImportBlueQuantum(const Imag switch (quantum_info->depth) { - case 10: + case 8: { - Quantum - cbcr[4]; + unsigned char + pixel; - pixel=0; - if (quantum_info->pack == MagickFalse) - { - register ssize_t - i; + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushCharPixel(p,&pixel); + SetPixelBlue(q,ScaleCharToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 16: + { + unsigned short + pixel; - size_t - quantum; + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); + p+=quantum_info->pad; + q++; + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ScaleShortToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 32: + { + unsigned int + pixel; - ssize_t - n; + if (quantum_info->format == FloatingPointQuantumFormat) + { + float + pixel; - n=0; - quantum=0; - for (x=0; x < (ssize_t) number_pixels; x+=2) + for (x=0; x < (ssize_t) number_pixels; x++) { - for (i=0; i < 4; i++) - { - switch (n % 3) - { - case 0: - { - p=PushLongPixel(quantum_info->endian,p,&pixel); - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 22) & 0x3ff) << 6))); - break; - } - case 1: - { - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 12) & 0x3ff) << 6))); - break; - } - case 2: - { - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 2) & 0x3ff) << 6))); - break; - } - } - cbcr[i]=(Quantum) (quantum); - n++; - } + p=PushFloatPixel(quantum_info,p,&pixel); + SetPixelBlue(q,ClampToQuantum(pixel)); p+=quantum_info->pad; - SetPixelRed(q,cbcr[1]); - SetPixelGreen(q,cbcr[0]); - SetPixelBlue(q,cbcr[2]); q++; - SetPixelRed(q,cbcr[3]); - SetPixelGreen(q,cbcr[0]); - SetPixelBlue(q,cbcr[2]); + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushLongPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ScaleLongToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 64: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + double + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushDoublePixel(quantum_info,p,&pixel); + SetPixelBlue(q,ClampToQuantum(pixel)); + p+=quantum_info->pad; q++; } break; @@ -1102,9 +1126,8 @@ static void ImportBlueQuantum(const Imag for (x=0; x < (ssize_t) number_pixels; x++) { p=PushQuantumPixel(quantum_info,p,&pixel); - SetPixelRed(q,ScaleAnyToQuantum(pixel,range)); - p=PushQuantumPixel(quantum_info,p,&pixel); - SetPixelGreen(q,ScaleAnyToQuantum(pixel,range)); + SetPixelBlue(q,ScaleAnyToQuantum(pixel,range)); + p+=quantum_info->pad; q++; } break; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
