mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 08:51:45 -08:00
Code Issues Projects Releases Wiki Activity
83315 commits 244 branches 194 tags 728 MiB
Commit graph

142 commits

Author SHA1 Message Date
Glenn Morris
9ec0b715e2 Switch to recommended form of GPLv3 permissions notice. 2008-05-14 07:50:26 +00:00
Kenichi Handa
3dcc8b84aa (image_ascent): Don't include "charset.h". Include 
"character.h" and "font.h".
 2008-05-14 01:39:03 +00:00
Chong Yidong
c4f13f44fb (png_load): Use correct bit-depth for setting background color. 2008-05-09 02:37:31 +00:00
Miles Bader
f67e15be8d Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1142
 2008-05-04 19:46:16 +00:00
YAMAMOTO Mitsuharu
4c75652929 [USE_MAC_IMAGE_IO] (image_load_image_io): 
Create bitmap context in native byte order.
 2008-05-04 00:31:59 +00:00
YAMAMOTO Mitsuharu
2ff0845e68 (PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]: 
New definitions for Image I/O support.
(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
(mac_create_cg_image_from_image, x_create_x_image_and_pixmap)
[USE_MAC_IMAGE_IO]: Add implementations for Image I/O support.
(mac_data_provider_release_data, image_load_image_io)
[USE_MAC_IMAGE_IO]: New functions.
(CGImageCreateWithPNGDataProviderProcType) [MAC_OSX]: Remove typedef.
(MyCGImageCreateWithPNGDataProvider) [MAC_OSX]: Remove variable.
(init_image_func_pointer) [MAC_OSX]: Remove function.
(image_load_quartz2d) [MAC_OSX]: Check availability of
CGImageCreateWithPNGDataProvider at compile time.
Use lowercase `false' for boolean constant.
(png_load, jpeg_load, tiff_load, gif_load) [USE_MAC_IMAGE_IO]:
Use image_load_image_io.
(png_load) [!USE_MAC_IMAGE_IO && MAC_OSX]:
Don't check MyCGImageCreateWithPNGDataProvider.
(init_image) [MAC_OSX && TARGET_API_MAC_CARBON]:
Don't call init_image_func_pointer.
 2008-05-02 09:39:01 +00:00
Miles Bader
5bc6ddff00 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
 2008-04-05 23:01:26 +00:00
Jason Rumney
b9c89e11fb (pbm_load): Allow color values up to 65535. 
Throw an error if max_color_idx is outside the supported range.
Report an error when image size is invalid.
Read two bytes at a time when raw images have max_color_idx above 255.
 2008-03-28 14:59:22 +00:00
Stefan Monnier
a2bc5bdd7d Allow fine-grained image-cache flushing. 
* dispextern.h (struct image): Add `dependencies' field.
(clear_image_caches): Change arg to Lisp_Object.
* image.c (make_image): Initialize `dependencies' field.
(clear_image_cache): Change arg to allow fine-grained flushing.
Perform the flush even if image-cache-eviction-delay is nil.
(clear_image_caches): Change arg to Lisp_Object.
(Fclear_image_cache): Expand meaning of the argument.
(mark_image): Mark `dependencies' field.
* xfaces.c (clear_face_cache): Adapt arg to call to clear_image_caches.
(lface_hash): Use XHASH rather than XFASTINT.
(face_at_buffer_position): Fix int -> EMACS_INT position.
* xdisp.c (next_overlay_change): Fix int -> EMACS_INT position.
(select_frame_for_redisplay): Remove code duplication.
(redisplay_internal): Adapt arg to call to clear_image_caches.
 2008-02-24 13:36:39 +00:00
Stefan Monnier
6087292e62 Include termhooks.h to find the image_cache slot in terminal objects. 2008-02-22 17:45:11 +00:00
Stefan Monnier
354884c46e Consolidate the image_cache to the terminal struct. 
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro.  Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
 2008-02-22 17:42:09 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
8cabe764e9 Add 2008 to copyright years. 2008-01-08 04:37:27 +00:00
Miles Bader
e5e76c0431 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-943
 2007-12-06 00:46:18 +00:00
Jason Rumney
44b1dc2e97 (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs. 2007-12-02 16:18:47 +00:00
Stefan Monnier
e047f44883 Rewrite abbrev.c in Elisp. 
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".
 2007-10-28 02:41:00 +00:00
Eli Zaretskii
1ea40aa2f3 Replace abs' with eabs'. 2007-10-13 12:48:57 +00:00
Miles Bader
5a1539f385 Add missing change from rel-22 branch to src/image.c 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-877
 2007-10-09 10:28:47 +00:00
Richard M. Stallman
65342ae385 (free_bitmap_record): Renamed from Free_Bitmap_Record. 2007-10-09 01:40:05 +00:00
Juanma Barranquero
4024ec3a26 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-05 09:00:38 +00:00
Juanma Barranquero
bbe6f2aa11 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-04 16:57:53 +00:00
Richard M. Stallman
867a0d72ea (our_memory_buffer): Renamed from omfib_buffer. 2007-09-21 23:08:01 +00:00
Glenn Morris
aca946f32e (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename 
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
 2007-09-14 07:44:58 +00:00
Glenn Morris
a99dc82bd8 (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename 
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
 2007-09-14 07:44:49 +00:00
Thien-Thi Nguyen
315912fb92 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:28:40 +00:00
Thien-Thi Nguyen
1ab2cd4392 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:25:18 +00:00
Glenn Morris
050b82f6f5 Comment. 2007-08-30 05:08:24 +00:00
Stefan Monnier
917ac1a9ba (png_load): Comment-out var only used in commented-out code. 2007-08-29 21:47:11 +00:00
Juanma Barranquero
747c316eac (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-28 11:39:26 +00:00
Miles Bader
62fb5e25f4 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 857-862)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
 2007-08-27 09:21:49 +00:00
Juanma Barranquero
3046a84b5e (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-24 13:46:24 +00:00
Jason Rumney
5fc9fdeb31 [HAVE_NTGUI]: Define dynamic loaded functions. 
(Qgdk_pixbuf, Qglib) [HAVE_NTGUI]: New symbols.
(syms_of_image) [HAVE_NTGUI]: Intern and staticpro them.
(init_svg_functions) [HAVE_NTGUI]: New function.
(fn_g_type_init, fn_g_object_unref, fn_g_error_free): New #defines.
(svg_load_image): Use them.
(svg_load_image) [HAVE_NTGUI]: Implement background.
 2007-08-24 00:28:53 +00:00
YAMAMOTO Mitsuharu
c21e615131 (svg_load_image): Blend with specified background if exists. 
Use IMAGE_BACKGROUND.  Add Mac OS Support.
 2007-08-23 08:44:57 +00:00
Glenn Morris
6678dc115d (x_find_image_file): Search in etc/images/ rather than etc/. 2007-08-22 07:51:39 +00:00
Glenn Morris
4ab27a430b Paul Pogonyshev <pogonyshev at gmx.net> 
Add support for SVG images.
Some additional comments by Joakim Verona <joakim@verona.se>.
 2007-08-22 04:01:54 +00:00
Miles Bader
aaf34461ff Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
 2007-08-13 13:51:08 +00:00
Chong Yidong
d725448fab Sync to trunk version. 
(search_image_cache, uncache_image, image-refresh): New functions.
Check for fg and bg colors.
(lookup_image): Use search_image_cache.  Cache fg and bg colors.
(pbm_load): Another check for invalid image data.
(png_load): Ignore default background field.
 2007-08-07 16:32:49 +00:00
Chong Yidong
8198352bca Minor cleanup. 2007-08-07 16:25:26 +00:00
Chong Yidong
465d8f275a (png_load): Ignore png-supplied background color. 2007-08-06 16:02:12 +00:00
Miles Bader
9899d01a0c Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
 2007-07-31 05:50:45 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22 
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
 2007-07-26 05:28:10 +00:00
Glenn Morris
684d6f5bcc Switch license to GPLv3 or later. 2007-07-25 05:19:07 +00:00
Miles Bader
7eb1e4534e Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 803-813)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
 2007-07-15 02:05:20 +00:00
Jason Rumney
2386b1f188 (convert_mono_to_color_image): Swap fore and background. 2007-06-21 23:02:14 +00:00
Jason Rumney
bfe7f3fcfc (convert_mono_to_color_image): Swap fore and background. 2007-06-21 22:01:27 +00:00
Miles Bader
262d5ce7c2 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
 2007-06-16 22:33:42 +00:00
Chong Yidong
cf26ebe85b (search_image_cache): Remove unused variable. 2007-06-14 01:48:01 +00:00
YAMAMOTO Mitsuharu
c5b8e0eaed (lookup_image): Save frame foreground and background colors. 
(search_image_cache): Check if saved and current frame colors match.
 2007-06-13 08:22:12 +00:00
Miles Bader
67f3ad67ee Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
 2007-06-11 01:00:07 +00:00
Chong Yidong
50fe226348 (xpm_load): Remove spurious call to xpm_init_color_cache. 2007-06-06 18:58:56 +00:00