(no commit message)

diff --git a/ChangeLog b/ChangeLog
index f588c609b269e914b000920b347ae10b3553b85f..80c31f406aa81588b152057ca3ba4643dbe4d8ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-03-18  6.6.0-8 Cristy  <quetzlzacatenango@image...>
   * The animate program no longer loops twice when -loop 1 is specified.
+  * The caption format would sometimes hang when the text was not UTF-8.
 
 2010-03-17  6.6.0-7 Cristy  <quetzlzacatenango@image...>
   * Detect CMYKProcessColor AI tag.

diff --git a/coders/dcm.c b/coders/dcm.c
index 2ee62fdae40ad704e2ea758df3e35bacc6d5c6b3..a6730ce45a7e658598fb95884bc103f04f2628bb 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3654,7 +3654,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if ((image->colormap == (PixelPacket *) NULL) && (samples_per_pixel == 1))
       {
         if (colors == 0)
-          colors=MagickMin(1UL << image->depth,MaxColormapSize);
+          colors=1UL << image->depth;
         if (AcquireImageColormap(image,colors) == MagickFalse)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
         if (redmap != (int *) NULL)
@@ -3848,8 +3848,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           0.5)/(window_width-1))+0.5));
                   }
                 index&=mask;
-                if ((scale != (Quantum *) NULL) && (index <= (int) max_value))
-                  index=(int) scale[index];
                 index=(int) ConstrainColormapIndex(image,(unsigned long) index);
                 indexes[x]=(IndexPacket) index;
                 pixel.red=1UL*image->colormap[index].red;

diff --git a/magick/image.c b/magick/image.c
index 9021411618e7134055cfb49cf6e81f250ffd958d..5856647993a1f3de12484039e83a890a984b0c33 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -322,7 +322,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  image->colors=MagickMin(colors,MaxColormapSize);
+  image->colors=colors;
   length=(size_t) colors;
   if (image->colormap == (PixelPacket *) NULL)
     image->colormap=(PixelPacket *) AcquireQuantumMemory(length,

diff --git a/magick/token-private.h b/magick/token-private.h
index a13181a16b7e8fb6e03b934f3d32304ba3cded35..bd8b5fe0b5af1e342f7cf91d4d11a80ba0e620cf 100644 (file)
--- a/magick/token-private.h
+++ b/magick/token-private.h
@@ -60,7 +60,7 @@ static inline long GetNextUTFCode(const char *text,size_t *octets)
     c,
     unicode;
 
-  *octets=0;
+  *octets=1;
   if (text == (const char *) NULL)
     {
       errno=EINVAL;