(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 6a542f8134055ca303e49861aedf6d849f8d9b65..6b332957f54b8c07cc39d4f72f3394a28e211ffa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-06-08  6.6.2-4 Cristy  <quetzlzacatenango@image...>
+  * End of string sentinal is \n not \r.
+
 2010-06-06  6.6.2-3 Glenn Randers-Pehrson <glennrp@image...>
   * Don't decode pixels in coders/png.c when image->ping is set.
 

diff --git a/magick/blob.c b/magick/blob.c
index b02d9381d2e1dac603062dd3d612910f729b6886..d3ab9f6507577ec33d74395d1a4f6cd5b9614d99 100644 (file)
--- a/magick/blob.c
+++ b/magick/blob.c
@@ -3328,9 +3328,11 @@ MagickExport char *ReadBlobString(Image *image,char *string)
         break;
       }
     string[i]=(char) (*p);
-    if ((string[i] == '\n') || (string[i] == '\r'))
+    if ((string[i] == '\r') || (string[i] == '\n'))
       break;
   }
+  if (string[i] == '\r')
+    (void) ReadBlobStream(image,1,buffer,&count);
   string[i]='\0';
   return(string);
 }