Changeset 4241

Timestamp:

09/06/08 17:17:38 (3 months ago)

Author:

fujii

Message:

Staticpro new variable imagemagick_image_types instead of doing
staticpro on each symbol for image formats supported by ImageMagick?,
avoiding exhaustion of staticvec.

* alloc.c (NSTATICS): Cancel increase for ImageMagick?.

* image.c (imagemagick_image_types): New variable.
(imagemagick_image_type_lisp_symbol): Add an interned symbol to
imagemagick_image_types.
(define_imagemagick_type): Staticpro imagemagick_image_types.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/alloc.c (modified) (1 diff)
• trunk/src/image.c (modified) (4 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2008-09-06  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * alloc.c (NSTATICS): Cancel increase for ImageMagick.
+
+        * image.c (imagemagick_image_types): New variable.
+        (imagemagick_image_type_lisp_symbol): Add an interned symbol to
+        imagemagick_image_types.
+        (define_imagemagick_type): Staticpro imagemagick_image_types.
+
-2008-07-22  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-

trunk/src/alloc.c

@@ -504 +504 @@
-   value; otherwise some compilers put it into BSS.  */
-
-#ifdef MEADOW
-#define NSTATICS 1540
-#else
-#define NSTATICS 1280
-#endif
-Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
-

trunk/src/image.c

@@ -9269 +9269 @@
-
-extern Lisp_Object Qxbm, Qpbm, Qxpm, Qjpeg, Qtiff, Qgif, Qpng;
+
+/* A list of symbols, one for each image type supported by ImageMagick. */
+Lisp_Object imagemagick_image_types;
-
-static int imagemagick_get_bits_per_pixel (MagickWand *);
@@ -10486 +10489 @@
-      struct image_type *type = lookup_image_type (sym);
-      if (type)
-
+
+
+
+
+
-    }
-
@@ -10492 +10499 @@
-  psym = (Lisp_Object *) xmalloc (sizeof (Lisp_Object));
-  *psym = Fintern (lowerstr, Qnil);
-staticpro (psym
+imagemagick_image_types = Fcons (*psym, imagemagick_image_types
-
-  return psym;
@@ -10509 +10516 @@
-  img_type.free = mw32_destruct_image;
-  img_type.next = NULL;
+
+  imagemagick_image_types = Qnil;
+  staticpro (&imagemagick_image_types);
-
-  if (formats == NULL)