Changeset 3626

Timestamp:

2005年03月06日 00時28分57秒 (4 years ago)

Author:

kit

Message:

- update to ImageMagick? 6.2.0.
- cleanup ImageMagick? support.

Files:

• branches/2.1/nt/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/nt/INSTALL.Meadow (modified) (2 diffs)
• branches/2.1/nt/INSTALL.Meadow.ja (modified) (2 diffs)
• branches/2.1/nt/configure.meadow.bat (modified) (7 diffs)
• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/makefile.nt (modified) (3 diffs)
• branches/2.1/src/mw32fns.c (modified) (29 diffs)
• branches/2.1/src/mw32magick.h (deleted)

branches/2.1/nt/ChangeLog.Meadow

@@ +1 @@
+2005-03-06  Shuichi KITAGUCHI  <kit@meadowy.org>
+
+        * configure.meadow.bat: add --magick option.
+
+        * INSTALL.Meadow.ja: Ditto.
+
+        * INSTALL.Meadow: Ditto.
+
-2004-11-28  Shuichi KITAGUCHI  <kit@meadowy.org>
-

branches/2.1/nt/INSTALL.Meadow

@@ -133 +133 @@
------------------
-cd Meadow-<VERSION>\nt [RETURN]
-
+--magick "<IMAGEMAGICK DIRECTORY>" 
-nmake bootstrap [RETURN]
-nmake all [RETURN]
@@ -163 +163 @@
------------------
-cd Meadow-<VERSION>/nt [RETURN]
-
+--magick "<IMAGEMAGICK DIRECTORY>" 
-make bootstrap [RETURN]
-make all [RETURN]

branches/2.1/nt/INSTALL.Meadow.ja

@@ -157 +157 @@
------------------
-cd Meadow-<VERSION>\nt [RETURN]
-
+--magick "<IMAGEMAGICK DIRECTORY>" 
-nmake bootstrap [RETURN]
-nmake all [RETURN]
@@ -185 +185 @@
------------------
-cd Meadow-<VERSION>/nt [RETURN]
-
+--magick "<IMAGEMAGICK DIRECTORY>" 
-make bootstrap [RETURN]
-make all [RETURN]

branches/2.1/nt/configure.meadow.bat

@@ -64 +64 @@
-rem   Default settings.
-set prefix=
+set magick=
-set nodebug=N
-set noopt=N
@@ -79 +80 @@
-if "%1" == "--help" goto usage
-if "%1" == "--prefix" goto setprefix
+if "%1" == "--magick" goto setmagick
-if "%1" == "--with-gcc" goto withgcc
-if "%1" == "--with-msvc" goto withmsvc
@@ -91 +93 @@
-echo Options:
-echo.   --prefix PREFIX         install Emacs in directory PREFIX
+echo.   --magick DIRECTORY      ImageMagick directory
-echo.   --with-gcc              use GCC to compile Emacs
-echo.   --with-msvc             use MSVC to compile Emacs
@@ -105 +108 @@
-shift
-goto again
-
+
+
+
+
+
+
+
-:withgcc
-set COMPILER=gcc
@@ -245 +254 @@
-rem ----------------------------------------------------------------------
-:genmakefiles
+if not "("%magick%")" == "()" goto genmakefiles2
+echo Error: --magick is not specified.
+goto end
+
+:genmakefiles2
-echo Generating makefiles
-
@@ -257 +271 @@
-if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
-if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings
+echo MAGICKDIR=%magick%>>config.settings
-if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings
-if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings
@@ -318 +333 @@
-:end
-set prefix=
+set magick=
-set nodebug=
-set noopt=

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2005-03-06  Shuichi KITAGUCHI  <kit@meadowy.org>
+
+        * mw32magick: removed. (cleanup ImageMagick support)
+
+        * mw32fns.c: update to ImageMagick 6.2.0.
+        cleanup ImageMagick support.
+
+        * makefile.nt (LOCAL_FLAGS): cleanup ImageMagick support.
+
-2005-01-08  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/makefile.nt

@@ -42 +42 @@
-# the emacs source tree.
-#
-
+
+
-!ifdef NTGUI
-LOCAL_FLAGS     = $(LOCAL_FLAGS) -DHAVE_NTGUI=1
@@ -353 +354 @@
-                cd $(BLD)
-                .\temacs.exe -nd -batch -l loadup bootstrap
+                if exist Meadow.dmp del Meadow.dmp
+                ren emacs.dmp Meadow.dmp
-                if exist Meadow.exe del Meadow.exe
-                ren emacs.exe Meadow.exe
-                if exist Meadow.dmp del Meadow.dmp
-                ren emacs.dmp Meadow.dmp
-                cd ..\..
-                - mkdir ..\bin
@@ -1610 +1611 @@
-    $(SRC)\fontset.h \
-    $(SRC)\termhooks.h \
-    $(SRC)\mw32magick.h \
-    $(SRC)\mw32rgb.h
-

branches/2.1/src/mw32fns.c

@@ -49 +49 @@
-#include "termhooks.h"
-#include "atimer.h"
-#include "mw32magick.h"
-
-/* external interfaces */
@@ -5981 +5980 @@
-                     ImageMagick Interface.
- ***********************************************************************/
+#define WIN32
+#include <magick/api.h>
+#include <magick/blob-private.h>
-
-#define IMAGE_MAGICK_DLL "CORE_RL_magick_.dll"
-
-
+
-
-Lisp_Object Qxbm, Qpbm, Qxpm, Qjpeg, Qtiff, Qgif, Qpng;
@@ -5996 +5997 @@
-/* ImageMagick function pointers.  */
-
+typedef const char* (*pget_magick_version_t) (unsigned long *);
-typedef void (*pinitialize_magick_t) (const char *);
-typedef Image *(*pread_image_t) (const ImageInfo *, ExceptionInfo *);
-typedef Image *(*pblob_to_image_t) (const ImageInfo *, const void *,
-                                    const size_t, ExceptionInfo *);
- 
+
-typedef void (*pdestroy_image_t) (Image *);
-typedef void (*pdestroy_image_info_t) (ImageInfo *);
@@ -6006 +6008 @@
-                                             const unsigned long,
-                                             const unsigned long);
-
-
+
-typedef Image *(*pping_blob_t) (const ImageInfo *, const void *,
- 
- 
-void 
-* 
- 
-pattern
-unsigned long *number_formats
+
+
+Image *
+ *
+
+, unsigned long *
+ExceptionInfo *
-typedef IndexPacket *(*pget_indexes_t) (const Image *);
-
+
+
-typedef const PixelPacket *(*pacquire_image_pixels_t) (const Image *,
-                                                       const long, const long,
@@ -6023 +6025 @@
-                                                       const unsigned long,
-                                                       ExceptionInfo *);
-unsigned int
-
-void
+MagickBooleanType
+     
+MagickBooleanType
-typedef Image *(*pconstitute_image_t) (const unsigned long,
-                                       const unsigned long,
@@ -6033 +6035 @@
-typedef PixelPacket* (*pset_image_pixels_t) (Image *, const long, const long,
-                                             const unsigned long,
- 
-unsigned int (*psync_image_pixels_t) (Image *); 
-unsigned int
-   
+
+MagickBooleanType (*psync_image_pixels_t) (Image *);
+MagickBooleanType
+       
-typedef char *(*pread_blob_string_t) (Image *, char *);
-typedef void (*pclose_blob_t) (Image *);
-
-
-
-
-
+
+
+
+
+
+
-typedef MagickInfo *(*pset_magick_info_t) (const char *);
-*memory
+
-typedef void *(*pacquire_string_t) (const char *);
-typedef const char *(*pget_image_magick_t) (const unsigned char *,
@@ -6052 +6055 @@
-static HINSTANCE hmagick = NULL;
-static ExceptionInfo magick_exception;
+
+static pget_magick_version_t pget_magick_version;
-static pinitialize_magick_t pinitialize_magick;
-static pread_image_t pread_image;
@@ -6060 +6065 @@
-static pget_image_pixels_t pget_image_pixels;
-static pget_exception_info_t pget_exception_info;
-static pget_magick_version_t pget_magick_version;
-static pping_blob_t pping_blob;
-static pping_image_t pping_image;
@@ -6088 +6092 @@
-/* ImageMagick function wrappers.  */
-
+static const char *
+magick_get_magick_version (unsigned long *version)
+{
+  if (hmagick == NULL || pget_magick_version == NULL)
+    return NULL;
+  return (*pget_magick_version) (version);
+}
+
-static void
-* path) 
-
-
+ *path)
+
+hmagick == NULL || 
-    return;
-  (*pinitialize_magick) (path);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    return NULL;
-  return (*pread_image) (image_info, exception);
-}
-
-
+ 
-magick_blob_to_image (const ImageInfo *image_info,
-                      const void *blob,
-                      const size_t length,
- 
-
-
+
+
+hmagick == NULL || 
-    return NULL;
-  return (*pblob_to_image) (image_info, blob, length, exception);
-}
-
+static ImageInfo *
+magick_clone_image_info (const ImageInfo *image_info)
+{
+  if (hmagick == NULL || pclone_image_info == NULL)
+    return NULL;
+  return (*pclone_image_info) (image_info);
+}
+
-static void
- 
-
-
+
+
+hmagick == NULL || 
-    return;
-  (*pdestroy_image) (image);
@@ -6142 +6146 @@
-magick_destroy_image_info (ImageInfo *image_info)
-{
-
+hmagick == NULL || 
-    return;
-  (*pdestroy_image_info) (image_info);
-}
-
-
+ 
-magick_get_image_pixels (Image *image,
-                         const long x,
@@ -6154 +6158 @@
-                         const unsigned long rows)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pget_image_pixels) (image, x, y, columns, rows);
-}
-
-const char*
-magick_version (unsigned int *vers
-
-pget_magick_version
- NULL
-return (*pget_magick_version) (vers
-
-
-
+void
+exception_info (ExceptionInfo *except
+
+hmagick == NULL || pget_exception_info
+
+(*pget_exception_info) (except
+
+
+ 
-magick_ping_blob (const ImageInfo *image_info,
-                  const void *blob,
@@ -6173 +6177 @@
-                  ExceptionInfo *exception)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pping_blob) (image_info, blob, length, exception);
-}
-
-
+ 
-magick_ping_image (const ImageInfo *image_info,
-                   ExceptionInfo *exception)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pping_image) (image_info, exception);
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-magick_get_magick_info (const char *name,
-                        ExceptionInfo *exception)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pget_magick_info) (name, exception);
@@ -6204 +6209 @@
-
-static char **
-
-
-
+
+
+
+
+
-    return NULL;
-
+, exception
-}
-
@@ -6214 +6221 @@
-magick_get_indexes (const Image *image)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pget_indexes) (image);
-}
-
-unsigned int
+MagickBooleanType
-magick_transform_rgb_image (Image *image, const ColorspaceType colorspace)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*ptransform_rgb_image) (image, colorspace);
-}
@@ -6234 +6241 @@
-                             ExceptionInfo *exception)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pacquire_image_pixels) (image, x, y, columns, rows, exception);
-}
-
-unsigned int
+MagickBooleanType
-magick_is_monochrome_image (const Image *image, ExceptionInfo *exception)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*pis_monochrome_image) (image, exception);
-}
-
-
+
-magick_set_image_type (Image *image, const ImageType image_type)
-{
-
-
-
-
-
-
+hmagick == NULL || 
+ MagickFalse
+return 
+
+
+ 
-magick_constitute_image (const unsigned long width, const unsigned long height,
-                         const char *map, const StorageType type,
-                         const void *pixels, ExceptionInfo *exception)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pconstitute_image) (width, height, map, type, pixels, exception);
-}
-
-
+ 
-magick_allocate_image (const ImageInfo *image_info)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pallocate_image) (image_info);
@@ -6279 +6286 @@
-                          const unsigned long rows)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pset_image_pixels) (image, x, y, columns, rows);
-}
-
-unsigned int
+MagickBooleanType
-magick_sync_image_pixels (Image *image)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*psync_image_pixels) (image);
-}
-
-unsigned int
+MagickBooleanType
-magick_open_blob (const ImageInfo *image_info, Image *image,
-                  const BlobMode mode, ExceptionInfo *exception)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*popen_blob) (image_info, image, mode, exception);
-}
@@ -6304 +6311 @@
-magick_read_blob_string (Image *image, char *string)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pread_blob_string) (image, string);
@@ -6312 +6319 @@
-magick_close_blob (Image *image)
-{
-
+hmagick == NULL || 
-    return;
-  (*pclose_blob) (image);
-}
-
-unsigned int
+MagickBooleanType
-magick_allocate_image_colormap (Image *image, const unsigned long colors)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*pallocate_image_colormap) (image, colors);
-}
-
-unsigned int
+MagickBooleanType
-magick_query_color_database (const char *name, PixelPacket *color,
-                             ExceptionInfo *exception)
-{
-
-0
+hmagick == NULL || 
+MagickFalse
-  return (*pquery_color_database) (name, color, exception);
-}
@@ -6337 +6344 @@
-magick_register_magick_info (MagickInfo *magick_info)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pregister_magick_info) (magick_info);
@@ -6345 +6352 @@
-magick_set_magick_info (const char *name)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pset_magick_info) (name);
@@ -6351 +6358 @@
-
-static void *
-*
-
-
+
+
+hmagick == NULL || 
-    return NULL;
-  return (*prelinquish_magick_memory) (memory);
@@ -6361 +6368 @@
-magick_acquire_string (const char *source)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pacquire_string) (source);
@@ -6369 +6376 @@
-magick_get_image_magick (const unsigned char *magick, const size_t length)
-{
-
+hmagick == NULL || 
-    return NULL;
-  return (*pget_image_magick) (magick, length);
@@ -6377 +6384 @@
-resolve_imagemagick_api (void)
-{
+  unsigned long version;
+
-  hmagick = LoadLibrary (IMAGE_MAGICK_DLL);
-  
-  if (hmagick == NULL)
-    return 0;
-
- 
+
-do {                                                    \
-  (var) = (type) GetProcAddress (hmagick, (name));      \
-  if (!(var)) goto error;                               \
-} while (0)
-
+
+
+
+
+
+
+
+
+
+
-  MAGICK_RESOLVE_FUNC (pinitialize_magick, pinitialize_magick_t,
-                       "InitializeMagick");
-  MAGICK_RESOLVE_FUNC (pread_image, pread_image_t, "ReadImage");
+  MAGICK_RESOLVE_FUNC (pblob_to_image, pblob_to_image_t, "BlobToImage");
-  MAGICK_RESOLVE_FUNC (pclone_image_info, pclone_image_info_t,
-                       "CloneImageInfo");
@@ -6400 +6418 @@
-  MAGICK_RESOLVE_FUNC (pget_exception_info, pget_exception_info_t,
-                       "GetExceptionInfo");
-  MAGICK_RESOLVE_FUNC (pblob_to_image, pblob_to_image_t, "BlobToImage");
-  MAGICK_RESOLVE_FUNC (pget_magick_version, pget_magick_version_t,
-                       "GetMagickVersion");
-  MAGICK_RESOLVE_FUNC (pping_blob, pping_blob_t, "PingBlob");
-  MAGICK_RESOLVE_FUNC (pping_image, pping_image_t, "PingImage");
@@ -6446 +6461 @@
-
-  return 1;
-
+
- error:
-  FreeLibrary (hmagick);
@@ -7269 +7284 @@
-}
-
-static int
-imagemagick_version_p (void)
-{
-  int version;
-  
-  magick_get_magick_version (&version);
-
-  if (version < IMAGE_MAGICK_REQUIRE_VERSION)
-    return 0;
-
-  return 1;
-}
-
-static Lisp_Object*
-imagemagick_image_type_lisp_symbol (const char *name)
@@ -7335 +7337 @@
-  unsigned long nformats;
-  struct image_type img_type;
-
+, &magick_exception
-
-  img_type.valid_p = imagemagick_image_p;
@@ -7803 +7805 @@
-  if (!resolve_imagemagick_api ())
-    return 0;
-
-  if (!imagemagick_version_p ())
-    {
-      FreeLibrary (hmagick);
-      hmagick = NULL;
-      return 0;
-    }
-
-  magick_initialize_magick (NULL);