Mercurial > emacs
changeset 109892:b7e155afcb64
imagemagick merge
| author | joakim@verona.se |
|---|---|
| date | Fri, 20 Aug 2010 22:01:27 +0200 |
| parents | c15a51661b50 (current diff) 373abedd1f02 (diff) |
| children | 2c97f9b178b4 |
| files | |
| diffstat | 5 files changed, 28 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/ChangeLog Fri Aug 20 22:01:27 2010 +0200 @@ -1,3 +1,7 @@ +2010-08-18 Joakim Verona <joakim@verona.se> + + * config.in, Makefile.in, configure.in: Checks for ImageMagick. + 2010-08-10 Dan Nicolaescu <dann@ics.uci.edu> * configure.in (AC_PREREQ): Require autoconf 2.65. @@ -139,21 +143,6 @@ * Makefile.in (install-arch-indep): Delete any old info .gz files first. -2010-06-12 Joakim Verona <joakim@verona.se> - - * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is - defined: - (imagemagick_image_p): New function to test for ImageMagic img. - (imagemagick_load): New function to load ImageMagick img. - (imagemagick_load_image): New function, helper for imagemagick_load - (imagemagick-types): New function. - (Qimagemagick): New Lisp_object. - (imagemagick-render-type): New var, decides which renderer to use - * image.el: - (imagemagick-types-inhibit): New var. - (imagemagick-register-types): New function. - * config.in, Makefile.in, configure.in - 2010-06-11 Glenn Morris <rgm@gnu.org> * configure.in (--without-compress-info): New option.
--- a/configure Fri Aug 20 22:49:20 2010 +0300 +++ b/configure Fri Aug 20 22:01:27 2010 +0200 @@ -8726,7 +8726,7 @@ fi -$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 1" >>confdefs.h +$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 0" >>confdefs.h
--- a/configure.in Fri Aug 20 22:49:20 2010 +0300 +++ b/configure.in Fri Aug 20 22:01:27 2010 +0200 @@ -1852,7 +1852,7 @@ LIBS="$IMAGEMAGICK_LIBS $LIBS" fi - AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 1, [Define to 1 if MagickExportImagePixels is defined.]) + AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 0, [Define to 1 if MagickExportImagePixels is defined.]) AC_CHECK_FUNCS_ONCE(MagickExportImagePixels) fi
--- a/lisp/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/lisp/ChangeLog Fri Aug 20 22:01:27 2010 +0200 @@ -38,6 +38,17 @@ * emacs-lisp/autoload.el (make-autoload): Preload the macros's declarations that are useful before running the macro. +2010-08-18 Joakim Verona <joakim@verona.se> + * image.el: + (imagemagick-types-inhibit): New var. + (imagemagick-register-types): New function. + * image-mode.el: + (image-transform-properties): New function. + (image-transform-set-scale, image-transform-fit-to-height) + (image-transform-set-rotation, image-transform-set-resize) + (image-transform-fit-to-width, image-transform-fit-to-height):New functions. + (image-toggle-display-image): Support image transforms. + 2010-08-18 Katsumi Yamaoka <yamaoka@jpl.org> * image.el (create-animated-image): Don't add heuristic mask to image
--- a/src/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/src/ChangeLog Fri Aug 20 22:01:27 2010 +0200 @@ -62,6 +62,17 @@ NXSecondaryPboard = SecondarySelection. (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677). +2010-08-18 Joakim Verona <joakim@verona.se> + + * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is + defined: + (imagemagick_image_p): New function to test for ImageMagic img. + (imagemagick_load): New function to load ImageMagick img. + (imagemagick_load_image): New function, helper for imagemagick_load + (imagemagick-types): New function. + (Qimagemagick): New Lisp_object. + (imagemagick-render-type): New var, decides which renderer to use + 2010-08-17 Stefan Monnier <monnier@iro.umontreal.ca> * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL