From fcb4db1026eeadb14471129e312341b54a0dd142 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 19 Mar 2010 01:34:36 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- coders/dcm.c | 21 +++++-- config/configure.xml | 2 +- index.html | 4 +- libtool | 2 +- magick/version.h | 2 +- version.sh | 2 +- www/advanced-unix-installation.html | 2 +- www/api.html | 40 ++++++------ www/api/animate.html | 2 +- www/api/blob.html | 4 +- www/api/cache-view.html | 2 +- www/api/cache.html | 2 +- www/api/color.html | 4 +- www/api/colormap.html | 2 +- www/api/compare.html | 5 +- www/api/composite.html | 3 - www/api/constitute.html | 4 +- www/api/decorate.html | 4 +- www/api/display.html | 5 +- www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 4 +- www/api/effect.html | 4 +- www/api/exception.html | 2 +- www/api/feature.html | 4 +- www/api/fx.html | 2 +- www/api/histogram.html | 3 + www/api/image.html | 5 +- www/api/layer.html | 5 +- www/api/magick-deprecate.html | 2 +- www/api/magick-image.html | 4 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 2 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/monitor.html | 2 +- www/api/montage.html | 2 +- www/api/morphology.html | 2 +- www/api/paint.html | 4 +- www/api/pixel-view.html | 3 - www/api/pixel-wand.html | 5 +- www/api/quantize.html | 2 +- www/api/registry.html | 5 +- www/api/resize.html | 5 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 2 +- www/api/signature.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/architecture.html | 2 +- www/binary-releases.html | 2 +- www/cipher.html | 2 +- www/color.html | 2 +- www/command-line-tools.html | 6 +- www/compare.html | 4 +- www/composite.html | 2 +- www/conjure.html | 3 - www/contact.html | 5 +- www/convert.html | 2 +- www/display.html | 2 +- www/escape.html | 2 +- www/examples.html | 4 +- www/exception.html | 2 +- www/fx.html | 4 +- www/history.html | 6 +- www/identify.html | 2 +- www/import.html | 5 +- www/index.html | 4 +- www/install-source.html | 5 +- www/jp2.html | 4 +- www/license.html | 2 +- www/links.html | 96 ++++++++++++++--------------- www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 5 +- www/miff.html | 4 +- www/mirrors.html | 9 ++- www/mogrify.html | 4 +- www/montage.html | 3 - www/motion-picture.html | 3 + www/perl-magick.html | 2 +- www/quantize.html | 2 +- www/resources.html | 2 +- www/search.html | 4 +- www/sitemap.html | 54 ++++++++-------- www/sponsors.html | 4 +- www/stream.html | 2 +- www/subversion.html | 5 +- www/t-shirt.html | 2 +- 91 files changed, 237 insertions(+), 243 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 8a8842b59..6260e836d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.0 -%define Patchlevel 7 +%define Patchlevel 8 Name: ImageMagick Version: %{VERSION} diff --git a/coders/dcm.c b/coders/dcm.c index 2ed758d1a..968f2e0b1 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3292,15 +3292,24 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Initialize colormap. */ - if (image->columns == 0) - break; - status=AcquireImageColormap(image,(unsigned long) (length+1)/2); - if (status == MagickFalse) - ThrowReaderException(ResourceLimitError,"UnableToCreateColormap"); + if (image->colormap == (PixelPacket *) NULL) + { + status=AcquireImageColormap(image,(unsigned long) length/2); + if (status == MagickFalse) + ThrowReaderException(ResourceLimitError, + "UnableToCreateColormap"); + } + else + if ((length/2) != image->colors) + ThrowReaderException(ResourceLimitError, + "UnableToCreateColormap"); p=data; for (i=0; i < (long) image->colors; i++) { - index=(unsigned short) ((*p) | (*(p+1)) << 8); + if (image->endian != LSBEndian) + index=(unsigned short) ((*p << 8) | *(p+1)); + else + index=(unsigned short) (*p | (*(p+1) << 8)); if (element == 0x1201) image->colormap[i].red=ScaleShortToQuantum(index); if (element == 0x1202) diff --git a/config/configure.xml b/config/configure.xml index 27de18fea..d78339587 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/index.html b/index.html index 4156a37f8..decdc85ac 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
diff --git a/libtool b/libtool index 1f1036e88..5ef32209c 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.0-7 +# Generated automatically by config.status (ImageMagick) 6.6.0-8 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/version.h b/magick/version.h index 7e00e193b..b477b363b 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x660 #define MagickLibVersionText "6.6.0" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-8" #define MagickLibInterface 3 #define MagickLibMinInterface 3 #define MagickReleaseDate "2010-03-18" diff --git a/version.sh b/version.sh index fa0b643ff..035acb9fd 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.0' PACKAGE_LIB_VERSION="0x660" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="8" PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 0d8876446..647c3b781 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -596,7 +596,7 @@ Options used to compile and link: Discourse Server • - Studio + Studio  
diff --git a/www/api.html b/www/api.html index e70fa62fe..21cd68e0a 100644 --- a/www/api.html +++ b/www/api.html @@ -163,7 +163,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -175,7 +175,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -187,31 +187,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -225,7 +225,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -237,50 +237,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 8842385b9..2b898c3c4 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -186,7 +186,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • - Studio + Studio   diff --git a/www/api/blob.html b/www/api/blob.html index 02d0e96f4..202cedf7e 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -124,7 +124,7 @@
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 429239c80..66cedcf4e 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -124,7 +124,7 @@
diff --git a/www/api/color.html b/www/api/color.html index ddc621a91..30b61bbad 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -124,7 +124,7 @@
diff --git a/www/api/colormap.html b/www/api/colormap.html index 05aa83564..c30de1b22 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -124,7 +124,7 @@