[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107154: imagemagick-render-type fixe
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107154: imagemagick-render-type fixes |
Date: |
Mon, 06 Feb 2012 19:31:29 -0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107154
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-06 19:31:29 -0800
message:
imagemagick-render-type fixes
* src/image.c (imagemagick-render-type): Change it from a lisp object
to an integer. Move the doc here from the lisp manual.
Treat all values not equal to 0 the same.
* doc/lispref/display.texi (ImageMagick Images):
Move most details of imagemagick-render-type to the variable's doc.
* lisp/cus-start.el (imagemagick-render-type): Add it.
modified:
doc/lispref/ChangeLog
doc/lispref/display.texi
lisp/ChangeLog
lisp/cus-start.el
src/ChangeLog
src/image.c
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2012-02-06 03:20:11 +0000
+++ b/doc/lispref/ChangeLog 2012-02-07 03:31:29 +0000
@@ -1,3 +1,8 @@
+2012-02-07 Glenn Morris <address@hidden>
+
+ * display.texi (ImageMagick Images):
+ Move most details of imagemagick-render-type to the variable's doc.
+
2012-02-06 Glenn Morris <address@hidden>
* keymaps.texi (Tool Bar): Mention separators.
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2012-02-03 08:44:30 +0000
+++ b/doc/lispref/display.texi 2012-02-07 03:31:29 +0000
@@ -4543,14 +4543,10 @@
For example, if you never want to use the ImageMagick loader to use
JPEG files, add @code{JPG} to this list.
address@hidden Not sure this should even be in the manual at all.
@vindex imagemagick-render-type
-You can set the variable @code{imagemagick-render-type} to choose
-between screen render methods for the ImageMagick loader. The options
-are: @code{0}, a conservative method which works with older
address@hidden FIXME details of this "newer method"?
address@hidden Presumably it is faster but may be less "robust"?
-ImageMagick versions (it is a bit slow, but robust); and @code{1},
-a newer ImageMagick method.
+If you wish to experiment with the performance of the ImageMagick
+loader, see the variable @code{imagemagick-render-type}.
Images loaded with ImageMagick support a few new display specifications:
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-06 22:08:41 +0000
+++ b/lisp/ChangeLog 2012-02-07 03:31:29 +0000
@@ -1,3 +1,7 @@
+2012-02-07 Glenn Morris <address@hidden>
+
+ * cus-start.el (imagemagick-render-type): Add it.
+
2012-02-06 Lars Ingebrigtsen <address@hidden>
* progmodes/cc-mode.el
=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-01-19 07:21:25 +0000
+++ b/lisp/cus-start.el 2012-02-07 03:31:29 +0000
@@ -237,6 +237,8 @@
:set custom-set-minor-mode)
;; fringe.c
(overflow-newline-into-fringe fringe boolean)
+ ;; image.c
+ (imagemagick-render-type image integer "24.1")
;; indent.c
(indent-tabs-mode indent boolean)
;; keyboard.c
@@ -504,6 +506,8 @@
(fboundp 'x-selection-exists-p))
((string-match "fringe" (symbol-name symbol))
(fboundp 'define-fringe-bitmap))
+ ((string-match "\\`imagemagick" (symbol-name symbol))
+ (fboundp 'imagemagick-types))
((equal "font-use-system-font" (symbol-name symbol))
(featurep 'system-font-setting))
;; Conditioned on x-create-frame, because that's
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-02-06 13:43:39 +0000
+++ b/src/ChangeLog 2012-02-07 03:31:29 +0000
@@ -1,3 +1,9 @@
+2012-02-07 Glenn Morris <address@hidden>
+
+ * image.c (imagemagick-render-type): Change it from a lisp object
+ to an integer. Move the doc here from the lisp manual.
+ Treat all values not equal to 0 the same.
+
2012-02-06 Chong Yidong <address@hidden>
* doc.c (store_function_docstring): Avoid applying docstring of
=== modified file 'src/image.c'
--- a/src/image.c 2012-01-19 07:21:25 +0000
+++ b/src/image.c 2012-02-07 03:31:29 +0000
@@ -7617,7 +7617,6 @@
EMACS_INT ino;
int desired_width, desired_height;
double rotation;
- EMACS_INT imagemagick_rendermethod;
int pixelwidth;
ImageInfo *image_info;
ExceptionInfo *exception;
@@ -7798,9 +7797,8 @@
went ok. */
init_color_table ();
- imagemagick_rendermethod = (INTEGERP (Vimagemagick_render_type)
- ? XINT (Vimagemagick_render_type) : 0);
- if (imagemagick_rendermethod == 0)
+
+ if (imagemagick_render_type == 0)
{
size_t image_height;
@@ -7850,8 +7848,7 @@
}
DestroyPixelIterator (iterator);
}
-
- if (imagemagick_rendermethod == 1)
+ else /* imagemagick_render_type != 0 */
{
/* Magicexportimage is normally faster than pixelpushing. This
method is also well tested. Some aspects of this method are
@@ -8958,8 +8955,17 @@
The function `clear-image-cache' disregards this variable. */);
Vimage_cache_eviction_delay = make_number (300);
#ifdef HAVE_IMAGEMAGICK
- DEFVAR_LISP ("imagemagick-render-type", Vimagemagick_render_type,
- doc: /* Choose between ImageMagick render methods. */);
+ DEFVAR_INT ("imagemagick-render-type", imagemagick_render_type,
+ doc: /* Integer indicating which ImageMagick rendering method to use.
+The options are:
+ 0 -- the default method (pixel pushing)
+ 1 -- a newer method ("MagickExportImagePixels") that may perform
+ better (speed etc) in some cases, but has not been as thoroughly
+ tested with Emacs as the default method. This method requires
+ ImageMagick version 6.4.6 (approximately) or later.
+*/);
+ /* MagickExportImagePixels is in 6.4.6-9, but not 6.4.4-10. */
+ imagemagick_render_type = 0;
#endif
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107154: imagemagick-render-type fixes,
Glenn Morris <=