[Emacs-diffs] /srv/bzr/emacs/trunk r101146: imagemagick merge

[joakim]

------------------------------------------------------------
revno: 101146 [merge]
committer: address@hidden
branch nick: trunk
timestamp: Fri 2010-08-20 22:01:27 +0200
message:
  imagemagick merge
modified:
  ChangeLog
  configure
  configure.in
  lisp/ChangeLog
  src/ChangeLog

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-08-18 10:35:23 +0000
+++ b/ChangeLog 2010-08-20 19:55:21 +0000
@@ -1,3 +1,7 @@
+2010-08-18 Joakim Verona <address@hidden>
+
+        * config.in, Makefile.in, configure.in: Checks for ImageMagick.
+
 2010-08-10  Dan Nicolaescu  <address@hidden>
 
        * 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 <address@hidden>
-
-        * 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  <address@hidden>
 
        * configure.in (--without-compress-info): New option.

=== modified file 'configure'
--- a/configure 2010-08-17 21:19:11 +0000
+++ b/configure 2010-08-20 19:55:21 +0000
@@ -8726,7 +8726,7 @@
   fi
 
 
-$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 1" >>confdefs.h
+$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 0" >>confdefs.h
 
 
 

=== modified file 'configure.in'
--- a/configure.in      2010-08-17 21:19:11 +0000
+++ b/configure.in      2010-08-20 19:55:21 +0000
@@ -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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-19 21:21:21 +0000
+++ b/lisp/ChangeLog    2010-08-20 20:00:00 +0000
@@ -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 <address@hidden>
+        * 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  <address@hidden>
 
        * image.el (create-animated-image): Don't add heuristic mask to image

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-20 19:49:20 +0000
+++ b/src/ChangeLog     2010-08-20 20:00:00 +0000
@@ -62,6 +62,17 @@
        NXSecondaryPboard = SecondarySelection.
        (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
 
+2010-08-18 Joakim Verona <address@hidden>
+
+        * 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  <address@hidden>
 
        * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL