(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 6e4621761faa0235d90bf2f489bbb7549a8de8e4..01873031265f90fe29e32c95bcf0e37db7d1d977 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-10-19"
+#define MagickReleaseDate  "2014-10-26"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/coders/sixel.c b/coders/sixel.c
index 13273090d2de348a1e7ec5c3a84cd0cf8541cf25..a0225c6a9786e6342f0f52921d031bc3cf7f167a 100644 (file)
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -712,7 +712,7 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
         return (MagickFalse);
     }
     sixel_advance(context, nwrite);
-    nwrite = sprintf((char *)context->buffer + context->pos, "\"1;1;%d;%d", width, height);
+    nwrite = sprintf((char *)context->buffer + context->pos, "\"1;1;%d;%d", (int) width, (int) height);
     if (nwrite <= 0) {
         RelinquishNodesAndMap;
         return (MagickFalse);
@@ -720,7 +720,7 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
     sixel_advance(context, nwrite);
 
     if (ncolors != 2 || keycolor == -1) {
-        for (n = 0; n < ncolors; n++) {
+        for (n = 0; n < (ssize_t) ncolors; n++) {
             /* DECGCI Graphics Color Introducer  # Pc ; Pu; Px; Py; Pz */
             nwrite = sprintf((char *)context->buffer + context->pos, "#%d;2;%d;%d;%d",
                              n,
@@ -739,36 +739,36 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
         }
     }
 
-    for (y = i = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+    for (y = i = 0; y < (ssize_t) height; y++) {
+        for (x = 0; x < (ssize_t) width; x++) {
             pix = pixels[y * width + x];
-            if (pix >= 0 && pix < ncolors && pix != keycolor) {
+            if (pix >= 0 && pix < (ssize_t) ncolors && pix != keycolor) {
                 map[pix * width + x] |= (1 << i);
             }
         }
 
-        if (++i < 6 && (y + 1) < height) {
+        if (++i < 6 && (y + 1) < (ssize_t) height) {
             continue;
         }
 
-        for (c = 0; c < ncolors; c++) {
-            for (left = 0; left < width; left++) {
+        for (c = 0; c < (ssize_t) ncolors; c++) {
+            for (left = 0; left < (ssize_t) width; left++) {
                 if (*(map + c * width + left) == 0) {
                     continue;
                 }
 
-                for (right = left + 1; right < width; right++) {
+                for (right = left + 1; right < (ssize_t) width; right++) {
                     if (*(map + c * width + right) != 0) {
                         continue;
                     }
 
-                    for (n = 1; (right + n) < width; n++) {
+                    for (n = 1; (right + n) < (ssize_t) width; n++) {
                         if (*(map + c * width + right + n) != 0) {
                             break;
                         }
                     }
 
-                    if (n >= 10 || right + n >= width) {
+                    if (n >= 10 || right + n >= (ssize_t) width) {
                         break;
                     }
                     right = right + n - 1;
@@ -1031,7 +1031,7 @@ static Image *ReadSIXELImage(const ImageInfo *image_info,ExceptionInfo *exceptio
       sixel_palette=(unsigned char *) RelinquishMagickMemory(sixel_palette);
       ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     }
-  for (i = 0; i < image->colors; ++i) {
+  for (i = 0; i < (ssize_t) image->colors; ++i) {
     image->colormap[i].red   = ScaleCharToQuantum(sixel_palette[i * 4 + 0]);
     image->colormap[i].green = ScaleCharToQuantum(sixel_palette[i * 4 + 1]);
     image->colormap[i].blue  = ScaleCharToQuantum(sixel_palette[i * 4 + 2]);

diff --git a/utilities/convert.1 b/utilities/convert.1
index 1b25c9cfc72b64c5a2316910e42a0bc046883bc7..f56fc7408799199c77bc06c6107f147015dbfa3f 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -144,6 +144,8 @@ Image Operators:
   \-clip-path id        clip along a named path from the 8BIM profile
   \-colorize value      colorize the image with the fill color
   \-color-matrix matrix apply color correction to the image
+  \-connected-component connectivity
+                       connected-components uniquely labeled
   \-contrast            enhance or reduce the image contrast
   \-contrast-stretch geometry
                        improve contrast by `stretching' the intensity range

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 154df50fbda626a3dbc7ada4da053da078c2a877..deb904eeda4977014af0c051ffdc75b68b949cfd 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -142,6 +142,8 @@ Image Operators:
   \-clip-path id        clip along a named path from the 8BIM profile
   \-colorize value      colorize the image with the fill color
   \-color-matrix matrix apply color correction to the image
+  \-connected-component connectivity
+                       connected-components uniquely labeled
   \-contrast            enhance or reduce the image contrast
   \-contrast-stretch geometry
                        improve contrast by `stretching' the intensity range