diff options
author | Joakim Verona <[email protected]> | 2010-08-20 21:55:21 +0200 |
---|---|---|
committer | Joakim Verona <[email protected]> | 2010-08-20 21:55:21 +0200 |
commit | ccd806186417c006a97ac89162d2af3acb3d3047 (patch) | |
tree | e15fcf659f82f0f7518149c7def2e80e1a9e45b2 | |
parent | 96fa1768839e3a9aa5ab5f2b782cea376460df9d (diff) |
minor imagemagick tweaks, one configure bugfix, and some ChangeLogs
-rw-r--r-- | ChangeLog | 19 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | lisp/ChangeLog | 11 | ||||
-rw-r--r-- | src/ChangeLog | 11 |
5 files changed, 28 insertions, 17 deletions
@@ -1,3 +1,7 @@ +2010-08-18 Joakim Verona <[email protected]> + + * config.in, Makefile.in, configure.in: Checks for ImageMagick. + 2010-08-10 Dan Nicolaescu <[email protected]> * 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 <[email protected]> - - * 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 <[email protected]> * configure.in (--without-compress-info): New option. @@ -8726,7 +8726,7 @@ $as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h fi -$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 1" >>confdefs.h +$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 0" >>confdefs.h diff --git a/configure.in b/configure.in index c989b0358a..11d660cbc8 100644 --- a/configure.in +++ b/configure.in @@ -1852,7 +1852,7 @@ if test "${with_imagemagick}" != "no"; then 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce5baa1b1a..333764d846 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -26,6 +26,17 @@ * emacs-lisp/autoload.el (make-autoload): Preload the macros's declarations that are useful before running the macro. +2010-08-18 Joakim Verona <[email protected]> + * 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 <[email protected]> * image.el (create-animated-image): Don't add heuristic mask to image diff --git a/src/ChangeLog b/src/ChangeLog index 0a1a268d96..5d26db9663 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -33,6 +33,17 @@ NXSecondaryPboard = SecondarySelection. (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677). +2010-08-18 Joakim Verona <[email protected]> + + * 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 <[email protected]> * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL |