diff options
| author | Joakim Verona | 2011-11-22 15:39:42 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-11-22 15:39:42 +0100 |
| commit | 40bb789236e486a3f36eefb2840c293369ce2af3 (patch) | |
| tree | 8e81d3aa5f232ec7f2c5187c683cb0998d2dc4e2 /src/image.c | |
| parent | 62318aed495a48e24ff73fe79e420dd801df3189 (diff) | |
| parent | a8e1496d750ab0f571b3412ff61aaa4da640a036 (diff) | |
| download | emacs-40bb789236e486a3f36eefb2840c293369ce2af3.tar.gz emacs-40bb789236e486a3f36eefb2840c293369ce2af3.zip | |
upstream
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index 14c74f10607..e80f2b72102 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7552,7 +7552,7 @@ imagemagick_image_p (Lisp_Object object) | |||
| 7552 | } | 7552 | } |
| 7553 | 7553 | ||
| 7554 | /* The GIF library also defines DrawRectangle, but its never used in Emacs. | 7554 | /* The GIF library also defines DrawRectangle, but its never used in Emacs. |
| 7555 | Therefore rename the function so it doesnt collide with ImageMagick. */ | 7555 | Therefore rename the function so it doesn't collide with ImageMagick. */ |
| 7556 | #define DrawRectangle DrawRectangleGif | 7556 | #define DrawRectangle DrawRectangleGif |
| 7557 | #include <wand/MagickWand.h> | 7557 | #include <wand/MagickWand.h> |
| 7558 | 7558 | ||
| @@ -7824,7 +7824,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7824 | 7824 | ||
| 7825 | if (imagemagick_rendermethod == 1) | 7825 | if (imagemagick_rendermethod == 1) |
| 7826 | { | 7826 | { |
| 7827 | /* Magicexportimage is normaly faster than pixelpushing. This | 7827 | /* Magicexportimage is normally faster than pixelpushing. This |
| 7828 | method is also well tested. Some aspects of this method are | 7828 | method is also well tested. Some aspects of this method are |
| 7829 | ad-hoc and needs to be more researched. */ | 7829 | ad-hoc and needs to be more researched. */ |
| 7830 | int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ | 7830 | int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ |
| @@ -7841,7 +7841,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7841 | } | 7841 | } |
| 7842 | 7842 | ||
| 7843 | 7843 | ||
| 7844 | /* Oddly, the below code doesnt seem to work:*/ | 7844 | /* Oddly, the below code doesn't seem to work:*/ |
| 7845 | /* switch(ximg->bitmap_unit){ */ | 7845 | /* switch(ximg->bitmap_unit){ */ |
| 7846 | /* case 8: */ | 7846 | /* case 8: */ |
| 7847 | /* pixelwidth=CharPixel; */ | 7847 | /* pixelwidth=CharPixel; */ |
| @@ -7870,7 +7870,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7870 | /*&(img->pixmap));*/ | 7870 | /*&(img->pixmap));*/ |
| 7871 | ximg->data); | 7871 | ximg->data); |
| 7872 | #else | 7872 | #else |
| 7873 | image_error ("You dont have MagickExportImagePixels, upgrade ImageMagick!", | 7873 | image_error ("You don't have MagickExportImagePixels, upgrade ImageMagick!", |
| 7874 | Qnil, Qnil); | 7874 | Qnil, Qnil); |
| 7875 | #endif | 7875 | #endif |
| 7876 | } | 7876 | } |
| @@ -8781,7 +8781,7 @@ syms_of_image (void) | |||
| 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ | 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ |
| 8782 | image_types = NULL; | 8782 | image_types = NULL; |
| 8783 | 8783 | ||
| 8784 | /* Must be defined now becase we're going to update it below, while | 8784 | /* Must be defined now because we're going to update it below, while |
| 8785 | defining the supported image types. */ | 8785 | defining the supported image types. */ |
| 8786 | DEFVAR_LISP ("image-types", Vimage_types, | 8786 | DEFVAR_LISP ("image-types", Vimage_types, |
| 8787 | doc: /* List of potentially supported image types. | 8787 | doc: /* List of potentially supported image types. |