rmagick 1.9.3 → 1.10.0

data/ext/RMagick/rmagick_config.h.in

@@ -3,20 +3,20 @@
 #undef HAVE_ACQUIREMAGICKMEMORY
 /* Introduced in IM 6.0.0 */
 #undef HAVE_ACQUIRESTRINGINFO
-/* Introduced in IM 5.5.2, GM 1.0 */
-#undef HAVE_ADAPTIVETHRESHOLDIMAGE
-/* Introduced in GM 1.1 */
+/* GraphicsMagick only */
 #undef HAVE_ADDDEFINITIONS
+/* Introduced in IM 6.2.5 */
+#undef HAVE_ADDNOISEIMAGECHANNEL
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_ALLCHANNELS
-/* Introduced in IM 5.5.2, GM 1.0 */
-#undef HAVE_APPENDIMAGETOLIST
 /* Introduced in IM 6.0.0 */
 #undef HAVE_BILEVELIMAGECHANNEL
 /* Introduced in IM 5.5.7, GM 1.1 */
 #undef HAVE_BLACKTHRESHOLDIMAGE
 /* Introduced in IM 6.0.1 */
 #undef HAVE_BLURIMAGECHANNEL
+/* Introduced in GM 1.2 */
+#undef HAVE_CINEONLOGRGBCOLORSPACE
 /* Introduced in IM 6.0.0 */
 #undef HAVE_COLORDODGECOMPOSITEOP
 /* Introduced in IM 6.0.0, GM 1.1 */
@@ -25,8 +25,6 @@
 #undef HAVE_CONVOLVEIMAGECHANNEL
 /* Introduced in IM 5.5.7, GM 1.1 */
 #undef HAVE_COPYCYANCOMPOSITEOP
-/* Introduced in IM 5.5.1, GM 1.0 */
-#undef HAVE_DISPOSETYPE
 /* Introduced in IM 6.0.0 */
 #undef HAVE_DSTCOMPOSITEOP
 /* Introduced in IM 6.0.1 */
@@ -39,7 +37,7 @@
 /* Introduced in IM 5.5.2, deprecated in IM 6.0.0 */
 #undef HAVE_EXTENDEDSIGNEDINTEGRALTYPE
 #undef HAVE_EXTENDEDUNSIGNEDINTEGRALTYPE
-/* Introduced in IM 5.5.5 */
+/* Introduced in IM 5.5.5 - Not defined in GraphicsMagick */
 #undef HAVE_FUZZYCOLORCOMPARE
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_GAMMAIMAGECHANNEL
@@ -73,10 +71,6 @@
 #undef HAVE_OLD_GETIMAGEQUANTUMDEPTH
 /* Introduced in GM 1.1 */
 #undef HAVE_GETIMAGESTATISTICS
-/* Introduced in IM 5.5.2, GM 1.0 */
-#undef HAVE_GETLOCALEEXCEPTIONMESSAGE
-/* Introduced in IM 5.5.1, GM 1.0 */
-#undef HAVE_GETMAGICKGEOMETRY
 /* Introduced in GM 1.1 */
 #undef HAVE_GETMAGICKINFOARRAY
 /* Introduced in IM 6.0.1 */
@@ -85,8 +79,8 @@
 #undef HAVE_GETMULTILINETYPEMETRICS
 /* API changed in IM 6.1.3 */
 #undef HAVE_OLD_GETMAGICKINFOLIST
+/* Introduced in IM 6.2.1 */
 #undef HAVE_GETNEXTIMAGEATTRIBUTE
-#undef HAVE_GETNEXTIMAGEINLIST
 /* Introduced in IM 6.0.0 */
 #undef HAVE_GETNEXTIMAGEPROFILE
 /* Introduced in IM 6.0.1 */
@@ -96,31 +90,29 @@
 #undef HAVE_GRAYCHANNEL
 /* Introduced in GM 1.0 */
 #undef HAVE_GRAYSCALEPSEUDOCLASSIMAGE
-/* Introduced in IM 6.0.0 */
+/* Introduced in IM 6.0.0 - Not available in GM */
 #undef HAVE_HSBCOLORSPACE
-/* Introduced in IM 5.5.7, GM 1.0 */
-#undef HAVE_HSLCOLORSPACE
-/* Introduced in IM 5.5.7, GM 1.0 */
-#undef HAVE_HWBCOLORSPACE
-/* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_INDEXCHANNEL
-/* Introduced in IM 5.5.6 */
+/* Introduced in IM 5.5.6 - Not available in GM */
 #undef HAVE_IMAGE_EXTRACT_INFO
 /* Introduced in IM 6.0.0 */
 #undef HAVE_IMAGE_QUALITY
 /* Introduced in IM 6.0.0 */
 #undef HAVE_IMAGE_ORIENTATION
+#undef HAVE_IMAGEINFO_ORIENTATION
 /* Introduced in IM 6.2.4 */
 #undef HAVE_IMAGE_TICKS_PER_SECOND
-/* Introduced in IM 5.5.6 */
-#undef HAVE_IMAGEINFO_NUMBER_SCENES
 /* Introduced in IM 5.5.7, GM 1.1 */
 #undef HAVE_IMPORTIMAGEPIXELS
 #undef HAVE_INTTYPES_H
+/* Introduced in IM 6.2.5 */
+#undef HAVE_ISCOLORSIMILAR
 /* Introduced in IM 6.2.2 */
 #undef HAVE_JPEG2000COMPRESSION
-/* Introduced in IM 5.5.3, GM 1.0 */
-#undef HAVE_LEVELIMAGECHANNEL
+/* Introduced in GM 1.2 */
+#undef HAVE_LABCOLORSPACE
+/* Introduced in IM 6.2.3 */
+#undef HAVE_LOGCOLORSPACE
 /* Introduced in IM 6.0.2 */
 #undef HAVE_MAGICKBOOLEANTYPE
 /* Introduced in IM 5.5.3, GM 1.0 */
@@ -133,36 +125,40 @@
 #undef HAVE_MEMORY_H
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_NEGATEIMAGECHANNEL
-/* Introduced in IM 5.5.1, GM 1.0 */
-#undef HAVE_NOCOMPLIANCE
 /* Introduced in IM 6.1.0 */
 #undef HAVE_NORMALIZEIMAGECHANNEL
-/* Introduced in IM 5.5.4 */
+/* Introduced in IM 5.5.4 - Not available in GM */
 #undef HAVE_PARSESIZEGEOMETRY
 /* Introduced in IM 6.0.0 */
 #undef HAVE_POSTERIZEIMAGE
-/* Introduced in IM 5.5.1, GM 1.0 */
+/* Introduced in IM 5.5.1? Not available in GM */
 #undef HAVE_PREVIEWIMAGE
 #undef HAVE_QUANTUMOPERATORREGIONIMAGE
 /* Introduced in IM 6.2.0 */
 #undef HAVE_QUANTUMPIXEL
+/* Not available in GM */
 #undef HAVE_RADIALBLURIMAGE
 #undef HAVE_RANDOMCHANNELTHRESHOLDIMAGE
 #undef HAVE_RANDOMTHRESHOLDIMAGECHANNEL
-#undef HAVE_REMOVEFIRSTIMAGEFROMLIST
+/* Introduced in GM 1.2 & IM 6.2.2 */
+#undef HAVE_REC601LUMACOLORSPACE
+#undef HAVE_REC601YCBCRCOLORSPACE
+#undef HAVE_REC709LUMACOLORSPACE
+#undef HAVE_REC709YCBCRCOLORSPACE
 /* Introduced in IM 6.2.1 */
 #undef HAVE_NEW_REMOVEIMAGEPROFILE
 #undef HAVE_REPLACECOMPOSITEOP
 #undef HAVE_SEPARATEIMAGECHANNEL
 /* Introduced in IM 6.2.1 */
 #undef HAVE_SEPIATONEIMAGE
+/* Introduced in IM 6.2.1 */
+#undef HAVE_SETIMAGEBACKGROUNDCOLOR
 #undef HAVE_SETIMAGECOLORSPACE
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_SETIMAGECHANNELDEPTH
 #undef HAVE_SETIMAGEOPTION
 /* Introduced in IM 6.1.0 */
 #undef HAVE_SETIMAGEPROGRESSMONITOR
-#undef HAVE_SETLOGFORMAT
 /* Introduced in IM 6.1.7 */
 #undef HAVE_SHADOWIMAGE
 /* Introduced in IM 6.0.1 */
@@ -179,7 +175,6 @@
 #undef HAVE_SYS_STAT_H
 #undef HAVE_SYS_TYPES_H
 #undef HAVE_THRESHOLDIMAGECHANNEL
-#undef HAVE_THUMBNAILIMAGE
 #undef HAVE_TINTIMAGE
 /* Introduced in IM 6.2.4 */
 #undef HAVE_TRANSPARENTVIRTUALPIXELMETHOD
@@ -189,6 +184,8 @@
 /* Introduced in IM 6.1.0 */
 #undef HAVE_UNSHARPMASKIMAGECHANNEL
 #undef HAVE_WHITETHRESHOLDIMAGE
+/* Introduced in IM 6.2.6 */
+#undef HAVE_VIGNETTEIMAGE
 #undef HAVE_XIMPORTIMAGE
 #undef MAGICKNAME
 #undef PACKAGE_BUGREPORT

data/ext/RMagick/rmdraw.c

@@ -1,6 +1,6 @@
-/* $Id: rmdraw.c,v 1.23 2005/06/24 22:31:33 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.27 2005/12/31 14:40:50 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmdraw.c
 | Author:   Tim Hunter
 | Purpose:  Contains Draw class methods.
@@ -412,8 +412,12 @@ VALUE Draw_annotate(
     rm_check_frozen(ImageList_cur_image(image_arg));
     Data_Get_Struct(ImageList_cur_image(image_arg), Image, image);
 
-    // Copy text to Draw structure
-    magick_clone_string(&draw->info->text, STRING_PTR(text));
+    // Translate & store in Draw structure
+    draw->info->text = TranslateText(NULL, image, STRING_PTR(text));
+    if (!draw->info->text)
+    {
+           rb_raise(rb_eArgError, "no text");
+    }
 
     // Create geometry string, copy to Draw structure, overriding
     // any previously existing value.
@@ -1300,14 +1304,18 @@ get_type_metrics(
      }
 
      Data_Get_Struct(self, Draw, draw);
-     magick_clone_string(&draw->info->text, text);
+     draw->info->text = TranslateText(NULL, image, text);
+     if (!draw->info->text)
+     {
+         rb_raise(rb_eArgError, "no text to measure");
+     }
 
      okay = (*getter)(image, draw->info, &metrics);
 
      if (!okay)
      {
          rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
-                  "Check the ImageMagick/GraphicsMagick 'type.xml' configuration file.");
+                  "Is the FreeType library installed?");
      }
      return TypeMetric_from_TypeMetric(&metrics);
 }

data/ext/RMagick/rmfill.c

@@ -1,6 +1,6 @@
-/* $Id: rmfill.c,v 1.12 2005/05/06 00:28:41 rmagick Exp $ */
+/* $Id: rmfill.c,v 1.13 2005/12/31 14:40:50 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmfill.c
 | Author:   Tim Hunter
 | Purpose:  GradientFill, TextureFill class definitions for RMagick

data/ext/RMagick/rmilist.c

@@ -1,6 +1,6 @@
-/* $Id: rmilist.c,v 1.27 2005/10/13 23:01:29 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.30 2006/01/06 23:55:53 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmilist.c
 | Author:   Tim Hunter
 | Purpose:  ImageList class method definitions for RMagick
@@ -36,7 +36,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
         unsigned int delay;
 
         delay = NUM2UINT(argv[0]);
-        for (img = images; img; img = GET_NEXT_IMAGE(img))
+        for (img = images; img; img = GetNextImageInList(img))
         {
             img->delay = delay;
         }
@@ -275,7 +275,7 @@ ImageList_montage(VALUE self)
     if (montage->compose != UndefinedCompositeOp)
     {
         Image *i;
-        for (i = image_list; i; i = GET_NEXT_IMAGE(i))
+        for (i = image_list; i; i = GetNextImageInList(i))
         {
             i->compose = montage->compose;
         }
@@ -321,6 +321,7 @@ ImageList_morph(VALUE self, VALUE nimages)
     images = rm_images_from_imagelist(self);
     GetExceptionInfo(&exception);
     new_images = MorphImages(images, (unsigned long)number_images, &exception);
+    rm_split(images);
     HANDLE_ERROR
 
     return rm_imagelist_from_images(new_images);
@@ -368,7 +369,6 @@ VALUE
 rm_imagelist_from_images(Image *images)
 {
      volatile VALUE new_imagelist;
-#if defined(HAVE_REMOVEFIRSTIMAGEFROMLIST)
      Image *image;
 
      new_imagelist = rm_imagelist_new();
@@ -378,18 +378,6 @@ rm_imagelist_from_images(Image *images)
           image = RemoveFirstImageFromList(&images);
           rm_imagelist_push(new_imagelist, rm_image_new(image));
      }
-#else
-     Image *image, *next;
-
-     new_imagelist = rm_imagelist_new();
-
-     for (image = images; image; image = next)
-     {
-          next = GET_NEXT_IMAGE(image);
-          image->previous = image->next = NULL;
-          rm_imagelist_push(new_imagelist, rm_image_new(image));
-     }
-#endif
 
      rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
      return new_imagelist;
@@ -407,9 +395,6 @@ rm_images_from_imagelist(VALUE imagelist)
 {
     long x, len;
     Image *head = NULL;
-#if !defined(HAVE_APPENDIMAGETOLIST)
-    Image *tail = NULL;
-#endif
 
     Check_Type(imagelist, T_ARRAY);
     len = rm_imagelist_length(imagelist);
@@ -423,20 +408,7 @@ rm_images_from_imagelist(VALUE imagelist)
         Image *image;
 
         Data_Get_Struct(rb_ary_entry(imagelist, x), Image, image);
-#if defined(HAVE_APPENDIMAGETOLIST)
         AppendImageToList(&head, image);
-#else
-        if (!head)
-        {
-            head = image;
-        }
-        else
-        {
-            image->previous = tail;
-            tail->next = image;
-        }
-        tail = image;
-#endif
     }
 
     return head;
@@ -573,7 +545,7 @@ ImageList_to_blob(VALUE self)
     if (*info->magick != '\0')
     {
         Image *img;
-        for (img = images; img; img = GET_NEXT_IMAGE(img))
+        for (img = images; img; img = GetNextImageInList(img))
         {
             strncpy(img->magick, info->magick, sizeof(info->magick)-1);
         }
@@ -657,7 +629,7 @@ ImageList_write(VALUE self, VALUE file)
 
     // Copy the filename into each images. Set a scene number to be used if
     // writing multiple files. (Ref: ImageMagick's utilities/convert.c
-    for (scene = 0, img = images; img; img = GET_NEXT_IMAGE(img))
+    for (scene = 0, img = images; img; img = GetNextImageInList(img))
     {
         img->scene = scene++;
         strcpy(img->filename, info->filename);
@@ -676,7 +648,7 @@ ImageList_write(VALUE self, VALUE file)
         info->adjoin = True;
     }
 
-    for (img = images; img; img = GET_NEXT_IMAGE(img))
+    for (img = images; img; img = GetNextImageInList(img))
     {
         (void) WriteImage(info, img);
         // images will be split before raising an exception

data/ext/RMagick/rmimage.c

@@ -1,6 +1,6 @@
-/* $Id: rmimage.c,v 1.123 2005/09/26 23:37:04 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.139 2006/01/18 00:22:33 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmimage.c
 | Author:   Tim Hunter
 | Purpose:  Image class method definitions for RMagick
@@ -26,7 +26,7 @@ typedef Image *(xformer_t)(const Image *, const RectangleInfo *, ExceptionInfo *
 
 static VALUE effect_image(VALUE, int, VALUE *, effector_t *);
 static VALUE rd_image(VALUE, VALUE, reader_t);
-static VALUE scale_image(int, int, VALUE *, VALUE, scaler_t *);
+static VALUE scale(int, int, VALUE *, VALUE, scaler_t *);
 static VALUE cropper(int, int, VALUE *, VALUE);
 static VALUE xform_image(int, VALUE, VALUE, VALUE, VALUE, VALUE, xformer_t);
 static VALUE threshold_image(int, VALUE *, VALUE, thresholder_t);
@@ -47,7 +47,6 @@ static ImageAttribute *Next_Attribute;
 VALUE
 Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
 {
-#ifdef HAVE_ADAPTIVETHRESHOLDIMAGE
     Image *image, *new_image;
     unsigned long width = 3, height = 3, offset = 0;
     ExceptionInfo exception;
@@ -72,10 +71,6 @@ Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
     new_image = AdaptiveThresholdImage(image, width, height, offset, &exception);
     HANDLE_ERROR
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 /*
@@ -87,18 +82,60 @@ VALUE
 Image_add_noise(VALUE self, VALUE noise)
 {
     Image *image, *new_image;
-    NoiseType nt;
+    NoiseType noise_type;
     ExceptionInfo exception;
 
     Data_Get_Struct(self, Image, image);
+
     GetExceptionInfo(&exception);
+    VALUE_TO_ENUM(noise, noise_type, NoiseType);
 
-    VALUE_TO_ENUM(noise, nt, NoiseType);
-    new_image = AddNoiseImage(image, nt, &exception);
+    new_image = AddNoiseImage(image, noise_type, &exception);
     HANDLE_ERROR
     return rm_image_new(new_image);
 }
 
+/*
+    Method:     Image#add_noise_channel(noise_type[,channel...])
+    Purpose:    add random noise to a copy of the image
+    Returns:    a new image
+*/
+VALUE
+Image_add_noise_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_ADDNOISEIMAGECHANNEL)
+    Image *image, *new_image;
+    NoiseType noise_type;
+    ExceptionInfo exception;
+    ChannelType channels;
+
+    channels = extract_channels(&argc, argv);
+
+    // There must be 1 remaining argument.
+    if (argc == 0)
+    {
+        rb_raise(rb_eArgError, "missing noise type argument");
+    }
+    else if (argc > 1)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+
+    Data_Get_Struct(self, Image, image);
+    GetExceptionInfo(&exception);
+    VALUE_TO_ENUM(argv[0], noise_type, NoiseType);
+    channels &= ~OpacityChannel;
+
+    new_image = AddNoiseImageChannel(image, channels, noise_type, &exception);
+    HANDLE_ERROR
+    return rm_image_new(new_image);
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
 /*
     Method:     Image#affine_transform(affine_matrix)
     Purpose:    transforms an image as dictated by the affine matrix argument
@@ -634,7 +671,7 @@ Image_change_geometry(VALUE self, VALUE geom_arg)
 
     return rb_yield(ary);
 
-#elif defined(HAVE_GETMAGICKGEOMETRY)
+#else
     Image *image;
     char *geometry;
     unsigned int flags;
@@ -663,9 +700,6 @@ Image_change_geometry(VALUE self, VALUE geom_arg)
 
     return rb_yield(ary);
 
-#else
-    rm_not_implemented();
-    return (VALUE)0;
 #endif
 }
 
@@ -1246,7 +1280,7 @@ Image_color_profile(VALUE self)
     }
 
 #else               /* !defined(HAVE_ACQUIRESTRINGINFO) */
-    const char *str;
+    const unsigned char *str;
     size_t length;
 
     Data_Get_Struct(self, Image, image);
@@ -1256,7 +1290,7 @@ Image_color_profile(VALUE self)
     str = GetImageProfile(image, "icc", &length);
     if (str)
     {
-        profile = rb_str_new(str, length);
+        profile = rb_str_new((char *)str, length);
     }
 
 #endif
@@ -1355,7 +1389,7 @@ Image_color_profile_eq(VALUE self, VALUE profile)
     }
     else
     {
-        prof = STRING_PTR_LEN(profile, prof_l);
+        prof = (unsigned char *)STRING_PTR_LEN(profile, prof_l);
         (void) SetImageProfile(image, "icc", prof, (size_t)prof_l);
     }
 #endif          /*  defined(HAVE_SETIMAGEPROFILE)   */
@@ -2113,7 +2147,11 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
     }
     image->columns = width;
     image->rows = height;
+#if defined(HAVE_SETIMAGEBACKGROUNDCOLOR)
+    SetImageBackgroundColor(image);
+#else
     SetImage(image, OpaqueOpacity);
+#endif
     okay = ImportImagePixels(image, 0, 0, width, height, map, stg_type, (void *)pixels.v);
     if (!okay)
     {
@@ -2977,41 +3015,57 @@ Image_erase_bang(VALUE self)
 
     rm_check_frozen(self);
     Data_Get_Struct(self, Image, image);
+
+#if defined(HAVE_SETIMAGEBACKGROUNDCOLOR)
+    SetImageBackgroundColor(image);
+#else
     SetImage(image, OpaqueOpacity);
+#endif
 
     return self;
 }
 
 /*
-    Method:     Image#export_pixels
+    Method:     Image#export_pixels(x=0, y=0, cols=self.columns, rows=self.rows, map="RGB")
     Purpose:    extract image pixels in the form of an array
 */
 VALUE
-Image_export_pixels(
-    VALUE self,
-    VALUE x_arg,
-    VALUE y_arg,
-    VALUE cols_arg,
-    VALUE rows_arg,
-    VALUE map_arg)
+Image_export_pixels(int argc, VALUE *argv, VALUE self)
 {
 #if defined(HAVE_EXPORTIMAGEPIXELS)
     Image *image;
-    long x_off, y_off;
+    long x_off = 0L, y_off = 0L;
     unsigned long cols, rows;
     unsigned long n, npixels;
     unsigned int okay;
-    char *map;
+    char *map = "RGB";
     volatile unsigned int *pixels;
     volatile VALUE ary;
     ExceptionInfo exception;
 
 
     Data_Get_Struct(self, Image, image);
-    x_off = NUM2LONG(x_arg);
-    y_off = NUM2LONG(y_arg);
-    cols  = NUM2ULONG(cols_arg);
-    rows  = NUM2ULONG(rows_arg);
+    cols = image->columns;
+    rows = image->rows;
+
+    switch (argc)
+    {
+        case 5:
+            map   = STRING_PTR(argv[4]);
+        case 4:
+            rows  = NUM2ULONG(argv[3]);
+        case 3:
+            cols  = NUM2ULONG(argv[2]);
+        case 2:
+            y_off = NUM2LONG(argv[1]);
+        case 1:
+            x_off = NUM2LONG(argv[0]);
+        case 0:
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 5)", argc);
+            break;
+    }
 
     if (   x_off < 0 || x_off > image->columns
         || y_off < 0 || y_off > image->rows
@@ -3020,7 +3074,6 @@ Image_export_pixels(
         rb_raise(rb_eArgError, "invalid extract geometry");
     }
 
-    map = STRING_PTR(map_arg);
 
     npixels = cols * rows * strlen(map);
     pixels = ALLOC_N(unsigned int, npixels);
@@ -3057,6 +3110,118 @@ Image_export_pixels(
 #endif
 }
 
+/*
+    Method:     Image#export_pixels_to_str(x=0, y=0, cols=self.columns,
+                       rows=self.rows, map="RGB", type=Magick::CharPixel)
+    Purpose:    extract image pixels to a Ruby string
+*/
+VALUE
+Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_EXPORTIMAGEPIXELS)
+    Image *image;
+    long x_off = 0L, y_off = 0L;
+    unsigned long cols, rows;
+    unsigned long npixels;
+    size_t sz;
+    unsigned int okay;
+    char *map = "RGB";
+    StorageType type = CharPixel;
+    volatile VALUE string;
+    char *str;
+    ExceptionInfo exception;
+
+    Data_Get_Struct(self, Image, image);
+    cols = image->columns;
+    rows = image->rows;
+
+    switch (argc)
+    {
+        case 6:
+            VALUE_TO_ENUM(argv[5], type, StorageType);
+        case 5:
+            map   = STRING_PTR(argv[4]);
+        case 4:
+            rows  = NUM2ULONG(argv[3]);
+        case 3:
+            cols  = NUM2ULONG(argv[2]);
+        case 2:
+            y_off = NUM2LONG(argv[1]);
+        case 1:
+            x_off = NUM2LONG(argv[0]);
+        case 0:
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 6)", argc);
+            break;
+    }
+
+    if (   x_off < 0 || x_off > image->columns
+        || y_off < 0 || y_off > image->rows
+        || cols == 0 || rows == 0)
+    {
+        rb_raise(rb_eArgError, "invalid extract geometry");
+    }
+
+
+    npixels = cols * rows * strlen(map);
+    switch (type)
+    {
+        case CharPixel:
+            sz = sizeof(unsigned char);
+            break;
+        case ShortPixel:
+            sz = sizeof(unsigned short);
+            break;
+        case DoublePixel:
+            sz = sizeof(double);
+            break;
+        case FloatPixel:
+            sz = sizeof(float);
+            break;
+        case IntegerPixel:
+            sz = sizeof(unsigned int);
+            break;
+        case LongPixel:
+            sz = sizeof(unsigned long);
+            break;
+#if defined(HAVE_QUANTUMPIXEL)
+        case QuantumPixel:
+            sz = sizeof(Quantum);
+            break;
+#endif
+        case UndefinedPixel:
+        default:
+            rb_raise(rb_eArgError, "undefined storage type");
+            break;
+    }
+
+    // Allocate a string long enough to hold the exported pixel data.
+    // Get a pointer to the buffer.
+    string = rb_str_new2("");
+    rb_str_resize(string, (long)(sz * npixels));
+    str = STRING_PTR(string);
+
+    GetExceptionInfo(&exception);
+
+    okay = ExportImagePixels(image, x_off, y_off, cols, rows, map, type, (void *)str, &exception);
+    if (!okay)
+    {
+        // Let GC have the string buffer.
+        rb_str_resize(string, 0);
+        HANDLE_ERROR
+        // Should never get here...
+        rb_raise(rb_eStandardError, "ExportImagePixels failed with no explanation.");
+    }
+
+    return string;
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
 /*
     Method:     Image#extract_info, extract_info=
     Purpose:    the extract_info attribute accessors
@@ -3760,7 +3925,7 @@ VALUE
 Image_import_pixels(int argc, VALUE *argv, VALUE self)
 {
 #if defined(HAVE_IMPORTIMAGEPIXELS)
-    Image *image, *clone_image;
+    Image *image;
     long x_off, y_off;
     unsigned long cols, rows;
     unsigned long npixels;
@@ -3772,7 +3937,6 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
     volatile int *pixels = NULL;
     volatile void *buffer;
     unsigned int okay;
-    ExceptionInfo exception;
 
     rm_check_frozen(self);
 
@@ -3883,15 +4047,9 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
     }
 
 
-    // Import into a clone - ImportImagePixels destroys the input image if an error occurs.
-    GetExceptionInfo(&exception);
-    clone_image = CloneImage(image, 0, 0, True, &exception);
-    HANDLE_ERROR
+    okay = ImportImagePixels(image, x_off, y_off, cols, rows, map, stg_type, (const void *)buffer);
 
-    okay = ImportImagePixels(clone_image, x_off, y_off, cols, rows, map, stg_type, (const void *)buffer);
-
-    // Free pixel array before checking for errors. If an error occurred, ImportImagePixels
-    // destroyed the clone image, so we don't have to.
+    // Free pixel array before checking for errors.
     if (pixels)
     {
         xfree((void *)pixels);
@@ -3899,15 +4057,11 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
 
     if (!okay)
     {
-        HANDLE_ERROR_IMG(clone_image)
+        HANDLE_ERROR_IMG(image)
         // Shouldn't get here...
         rb_raise(rb_eStandardError, "ImportImagePixels failed with no explanation.");
     }
 
-    // Everything worked. Replace the image with the clone and destroy the original.
-    DATA_PTR(self) = clone_image;
-            DestroyImage(image);
-
     return self;
 
 #else
@@ -3942,11 +4096,7 @@ Image_inspect(VALUE self)
     // Print current filename.
     x += sprintf(buffer+x, "%s", image->filename);
     // Print scene number.
-#if defined(HAVE_GETNEXTIMAGEINLIST)
     if ((GetPreviousImageInList(image) != NULL) && (GetNextImageInList(image) != NULL) && image->scene > 0)
-#else
-    if ((image->previous || image->next) && image->scene > 0)
-#endif
     {
         x += sprintf(buffer+x, "[%lu]", image->scene);
     }
@@ -4123,7 +4273,7 @@ Image_iptc_profile(VALUE self)
     prof = GetImageProfile(image, "iptc", &length);
     if (prof)
     {
-        profile = rb_str_new(prof, (long) length);
+        profile = rb_str_new((char *)prof, (long) length);
     }
 #endif
 
@@ -4220,7 +4370,7 @@ Image_iptc_profile_eq(VALUE self, VALUE profile)
     }
     else
     {
-        prof = STRING_PTR_LEN(profile, prof_l);
+        prof = (unsigned char *)STRING_PTR_LEN(profile, prof_l);
         (void) SetImageProfile(image, "iptc", prof, (size_t)prof_l);
     }
 #endif
@@ -4311,7 +4461,6 @@ Image_level(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_level_channel(int argc, VALUE *argv, VALUE self)
 {
-#ifdef HAVE_LEVELIMAGECHANNEL
     Image *image, *new_image;
     double black_point = 0.0, mid_point = 1.0, white_point = (double)MaxRGB;
     ChannelType channel;
@@ -4353,10 +4502,6 @@ Image_level_channel(int argc, VALUE *argv, VALUE self)
                            , white_point);
     HANDLE_ERROR_IMG(new_image)
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 /*
@@ -4985,7 +5130,11 @@ Image_initialize(VALUE self, VALUE info_obj, VALUE width, VALUE height, VALUE fi
     // specifying it when creating the Info parm block.
     if (!fill)
     {
+#if defined(HAVE_SETIMAGEBACKGROUNDCOLOR)
+        SetImageBackgroundColor(image);
+#else
         SetImage(image, OpaqueOpacity);
+#endif
     }
     // fillobj.fill(self)
     else
@@ -5254,23 +5403,54 @@ Image_opaque_q(VALUE self)
 }
 
 /*
-    Method:     Image#ordered_dither
-    Purpose:    call OrderedDitherImage
+    Method:     Image#ordered_dither(order=2)
+    Purpose:    perform ordered dither on image
+    Notes:      order must be 2, 3, or 4
+                I don't call OrderedDitherImages anymore. Sometime after
+                IM 6.0.0 it quit working. IM and GM use the routines I use
+                below to implement the "ordered-dither" option.
 */
 VALUE
-Image_ordered_dither(VALUE self)
+Image_ordered_dither(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
+    int order;
+    const char *thresholds = "2x2";
     ExceptionInfo exception;
 
+    if (argc > 1)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
+    }
+    if (argc == 1)
+    {
+        order = NUM2INT(argv[0]);
+        if (order == 3)
+        {
+            thresholds = "3x3";
+        }
+        else if (order == 4)
+        {
+            thresholds = "4x4";
+        }
+        else if (order != 2)
+        {
+            rb_raise(rb_eArgError, "order must be 2, 3, or 4 (%d given)", order);
+        }
+    }
+
+
     Data_Get_Struct(self, Image, image);
     GetExceptionInfo(&exception);
 
     new_image = CloneImage(image, 0, 0, True, &exception);
     HANDLE_ERROR
-
-    (void) OrderedDitherImage(new_image);
-    HANDLE_ERROR_IMG(new_image)
+#if defined(HAVE_RANDOMTHRESHOLDIMAGECHANNEL)
+    (void) RandomThresholdImageChannel(new_image, AllChannels, thresholds, &exception);
+#else
+    (void) RandomChannelThresholdImage(new_image, "all", thresholds, &exception);
+#endif
+    HANDLE_ERROR
     return rm_image_new(new_image);
 }
 
@@ -6174,18 +6354,11 @@ static VALUE array_from_images(Image *images)
      // Orphan the image, create an Image object, add it to the array.
 
      image_ary = rb_ary_new();
- #ifdef HAVE_REMOVEFIRSTIMAGEFROMLIST
+     next = NULL;
      next = next;        // defeat "never referenced" message from icc
      while (images)
      {
          image = RemoveFirstImageFromList(&images);
-
- #else
-     for (image = images; image; image = next)
-     {
-         next = images->next;
-         image->next = image->previous = NULL;
- #endif
          image_obj = rm_image_new(image);
          rb_ary_push(image_ary, image_obj);
      }
@@ -6258,7 +6431,7 @@ resize(int bang, int argc, VALUE *argv, VALUE self)
     double scale;
     FilterTypes filter;
     unsigned long rows, columns;
-    double blur;
+    double blur, drows, dcols;
     ExceptionInfo exception;
 
     Data_Get_Struct(self, Image, image);
@@ -6278,11 +6451,25 @@ resize(int bang, int argc, VALUE *argv, VALUE self)
         case 2:
             rows = NUM2ULONG(argv[1]);
             columns = NUM2ULONG(argv[0]);
+            if (columns == 0 || rows == 0)
+            {
+                rb_raise(rb_eArgError, "invalid result dimension (%lu, %lu given)", columns, rows);
+            }
             break;
         case 1:
             scale = NUM2DBL(argv[0]);
-            rows = scale * image->rows;
-            columns = scale * image->columns;
+            if (scale < 0.0)
+            {
+                rb_raise(rb_eArgError, "invalid scale value (%g given)", scale);
+            }
+            drows = scale * image->rows + 0.5;
+            dcols = scale * image->columns + 0.5;
+            if (drows > ULONG_MAX || dcols > ULONG_MAX)
+            {
+                rb_raise(rb_eRangeError, "resulting image too big");
+            }
+            rows = (unsigned long) drows;
+            columns = (unsigned long) dcols;
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
@@ -6386,14 +6573,14 @@ DEF_ATTR_READER(Image, rows, int)
 VALUE
 Image_sample(int argc, VALUE *argv, VALUE self)
 {
-    return scale_image(False, argc, argv, self, SampleImage);
+    return scale(False, argc, argv, self, SampleImage);
 }
 
 VALUE
 Image_sample_bang(int argc, VALUE *argv, VALUE self)
 {
     rm_check_frozen(self);
-    return scale_image(True, argc, argv, self, SampleImage);
+    return scale(True, argc, argv, self, SampleImage);
 }
 
 /*
@@ -6406,28 +6593,28 @@ Image_sample_bang(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_scale(int argc, VALUE *argv, VALUE self)
 {
-    return scale_image(False, argc, argv, self, ScaleImage);
+    return scale(False, argc, argv, self, ScaleImage);
 }
 
 VALUE
 Image_scale_bang(int argc, VALUE *argv, VALUE self)
 {
     rm_check_frozen(self);
-    return scale_image(True, argc, argv, self, ScaleImage);
+    return scale(True, argc, argv, self, ScaleImage);
 }
 
 /*
-    Static:     scale_image
+    Static:     scale
     Purpose:    Call ScaleImage or SampleImage
     Arguments:  if 1 argument > 0, multiply current size by this much
                 if 2 arguments, (cols, rows)
 */
 static VALUE
-scale_image(int bang, int argc, VALUE *argv, VALUE self, scaler_t *scaler)
+scale(int bang, int argc, VALUE *argv, VALUE self, scaler_t *scaler)
 {
     Image *image, *new_image;
     unsigned long columns, rows;
-    double scale;
+    double scale, drows, dcols;
     ExceptionInfo exception;
 
     Data_Get_Struct(self, Image, image);
@@ -6437,9 +6624,9 @@ scale_image(int bang, int argc, VALUE *argv, VALUE self, scaler_t *scaler)
         case 2:
             columns = NUM2ULONG(argv[0]);
             rows    = NUM2ULONG(argv[1]);
-            if (columns <= 0 || rows <= 0)
+            if (columns == 0 || rows == 0)
             {
-                rb_raise(rb_eArgError, "invalid scale given (%dl, %dl given)", columns, rows);
+                rb_raise(rb_eArgError, "invalid result dimension (%lu, %lu given)", columns, rows);
             }
             break;
         case 1:
@@ -6448,8 +6635,14 @@ scale_image(int bang, int argc, VALUE *argv, VALUE self, scaler_t *scaler)
             {
                 rb_raise(rb_eArgError, "invalid scale value (%g given)", scale);
             }
-            rows = image->rows * scale;
-            columns = image->columns * scale;
+            drows = scale * image->rows + 0.5;
+            dcols = scale * image->columns + 0.5;
+            if (drows > ULONG_MAX || dcols > ULONG_MAX)
+            {
+                rb_raise(rb_eRangeError, "resulting image too big");
+            }
+            rows = (unsigned long) drows;
+            columns = (unsigned long) dcols;
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
@@ -7553,10 +7746,9 @@ VALUE threshold_image(
 static VALUE
 thumbnail(int bang, int argc, VALUE *argv, VALUE self)
 {
-#ifdef HAVE_THUMBNAILIMAGE
     Image *image, *new_image;
     unsigned long columns, rows;
-    double scale;
+    double scale, drows, dcols;
     ExceptionInfo exception;
 
     Data_Get_Struct(self, Image, image);
@@ -7566,11 +7758,25 @@ thumbnail(int bang, int argc, VALUE *argv, VALUE self)
         case 2:
             columns = NUM2ULONG(argv[0]);
             rows = NUM2ULONG(argv[1]);
+            if (columns == 0 || rows == 0)
+            {
+                rb_raise(rb_eArgError, "invalid result dimension (%lu, %lu given)", columns, rows);
+            }
             break;
         case 1:
             scale = NUM2DBL(argv[0]);
-            rows = scale * image->rows;
-            columns = scale * image->columns;
+            if (scale < 0.0)
+            {
+                rb_raise(rb_eArgError, "invalid scale value (%g given)", scale);
+            }
+            drows = scale * image->rows + 0.5;
+            dcols = scale * image->columns + 0.5;
+            if (drows > ULONG_MAX || dcols > ULONG_MAX)
+            {
+                rb_raise(rb_eRangeError, "resulting image too big");
+            }
+            rows = (unsigned long) drows;
+            columns = (unsigned long) dcols;
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
@@ -7589,10 +7795,6 @@ thumbnail(int bang, int argc, VALUE *argv, VALUE self)
     }
 
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 VALUE
@@ -7772,6 +7974,7 @@ Image_to_blob(VALUE self)
 {
     Image *image;
     Info *info;
+    const MagickInfo *magick_info;
     volatile VALUE info_obj;
     volatile VALUE blob_str;
     void *blob = NULL;
@@ -7807,6 +8010,20 @@ Image_to_blob(VALUE self)
         strncpy(image->magick, info->magick, sizeof(info->magick)-1);
     }
 
+    // Fix #2844 - libjpeg exits when image is 0x0
+    magick_info = GetMagickInfo(image->magick, &exception);
+    HANDLE_ERROR
+    if (magick_info)
+    {
+        if (  (!rm_strcasecmp(magick_info->name, "JPEG")
+            || !rm_strcasecmp(magick_info->name, "JPG"))
+            && (image->rows == 0 || image->columns == 0))
+        {
+            rb_raise(rb_eRuntimeError, "Can't convert %lux%lu %.4s image to a blob"
+                   , image->columns, image->rows, magick_info->name);
+        }
+    }
+
     blob = ImageToBlob(info, image, &length, &exception);
     HANDLE_ERROR
     if (length == 0 || !blob)
@@ -8134,6 +8351,60 @@ Image_unsharp_mask_channel(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+  Method:   Image#vignette(horz_radius, vert_radius, radius, sigma);
+  Purpose:  soften the edges of an image
+  Notes:    The outer edges of the image are replaced by the background color.
+*/
+VALUE
+Image_vignette(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_VIGNETTEIMAGE)
+    Image *image, *new_image;
+    long horz_radius, vert_radius;
+    double radius = 0.0, sigma = 10.0;
+    ExceptionInfo exception;
+
+    Data_Get_Struct(self, Image, image);
+
+    horz_radius = image->columns * 0.10 + 0.5;
+    vert_radius = image->rows * 0.10 + 0.5;
+
+    switch (argc)
+    {
+        case 4:
+            sigma = NUM2DBL(argv[3]);
+        case 3:
+            radius = NUM2DBL(argv[2]);
+        case 2:
+            vert_radius = NUM2INT(argv[1]);
+        case 1:
+            horz_radius = NUM2INT(argv[0]);
+        case 0:
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 4)", argc);
+            break;
+    }
+
+    GetExceptionInfo(&exception);
+
+    new_image = VignetteImage(image, radius, sigma, horz_radius, vert_radius, &exception);
+    HANDLE_ERROR
+    if (!new_image)
+    {
+        rb_raise(rb_eRuntimeError, "VignetteImage failed");
+    }
+
+    return rm_image_new(new_image);
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 /*
   Method:   Image#virtual_pixel_method
   Purpose:  get the VirtualPixelMethod for the image
@@ -8532,12 +8803,14 @@ static ChannelType extract_channels(
         *argc -= 1;
     }
 
-#if defined(HAVE_ALLCHANNELS)
     if (channels == 0)
     {
+#if defined(HAVE_ALLCHANNELS)
         channels = AllChannels;
-    }
+#else
+        channels = 0xff;
 #endif
+    }
 
     return channels;
 }