Fixed dds:cluster-fit option.

[imagemagick] / coders / html.c
diff --git a/coders/html.c b/coders/html.c

index 97e1673a278133e6f11f7b52f43fef0553fe468d..3d3f97084884b50f40f9a7786e66415b2239c6a6 100644 (file)
--- a/coders/html.c
+++ b/coders/html.c
@@ -14,11 +14,11 @@
  %                 Image Montage & Directory Information.                      %
  %                                                                             %
  %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
  %                                 July 1992                                   %
  %                                                                             %
  %                                                                             %
-%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
  %  dedicated to making software imaging solutions freely available.           %
  %                                                                             %
  %  You may not use this file except in compliance with the License.  You may  %
@@ -250,8 +250,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
    if (status == MagickFalse)
      return(status);
    (void) CloseBlob(image);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace);
+  if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
    *url='\0';
    if ((LocaleCompare(image_info->magick,"FTP") == 0) ||
        (LocaleCompare(image_info->magick,"HTTP") == 0))
@@ -292,6 +292,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
          Open output image file.
        */
        assert(exception != (ExceptionInfo *) NULL);
+      status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
        if (status == MagickFalse)
          return(status);
        /*
@@ -304,7 +305,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
          "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
        (void) WriteBlobString(image,"<html>\n");
        (void) WriteBlobString(image,"<head>\n");
-      value=GetImageProperty(image,"label");
+      value=GetImageProperty(image,"label",exception);
        if (value != (const char *) NULL)
          (void) FormatLocaleString(buffer,MaxTextExtent,"<title>%s</title>\n",
            value);
@@ -339,8 +340,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
        (void) FormatLocaleString(buffer,MaxTextExtent,
          "<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
        (void) WriteBlobString(image,buffer);
-      (void) FormatLocaleString(buffer,MaxTextExtent,"  <area href=\"%s",
-        url);
+      (void) FormatLocaleString(buffer,MaxTextExtent,"  <area href=\"%s",url);
        (void) WriteBlobString(image,buffer);
        if (image->directory == (char *) NULL)
          {