Mercurial > hg > xemacs-beta
annotate src/imgproc.h @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 2aa9cd456ae7 |
children | 574f0cded429 |
rev | line source |
---|---|
428 | 1 /* Image processing aux functions header file |
2 Copyright (C) 1998 Jareth Hein | |
3 | |
4 This file is a part of XEmacs | |
5 | |
5405 | 6 XEmacs is free software: you can redistribute it and/or modify it |
428 | 7 under the terms of the GNU General Public License as published by the |
5405 | 8 Free Software Foundation, either version 3 of the License, or (at your |
9 option) any later version. | |
428 | 10 |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
5405 | 17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
428 | 18 |
440 | 19 #ifndef INCLUDED_imgproc_h_ |
20 #define INCLUDED_imgproc_h_ | |
21 | |
428 | 22 /* Synched up with: Not in FSF. */ |
23 | |
24 /* Original author: Jareth Hein */ | |
25 | |
26 #define MAX_CMAP_SIZE 256 | |
27 #define COLOR_DEPTH 8 | |
28 #define MAX_COLOR 256 | |
29 | |
30 #define B_DEPTH 5 /* # bits/pixel to use */ | |
31 #define B_LEN (1L<<B_DEPTH) | |
32 | |
33 #define C_DEPTH 2 | |
34 #define C_LEN (1L<<C_DEPTH) /* # cells/color to use */ | |
35 | |
36 #define COLOR_SHIFT (COLOR_DEPTH-B_DEPTH) | |
37 | |
38 typedef struct colorbox { | |
39 struct colorbox *next, *prev; | |
40 int rmin, rmax; | |
41 int gmin, gmax; | |
42 int bmin, bmax; | |
43 int total; | |
44 } Colorbox; | |
45 | |
46 typedef struct { | |
47 int num_ents; | |
48 int entries[MAX_CMAP_SIZE][2]; | |
49 } C_cell; | |
50 | |
51 typedef struct { | |
52 unsigned short rm[MAX_CMAP_SIZE], gm[MAX_CMAP_SIZE], bm[MAX_CMAP_SIZE]; /* map values */ | |
53 int um[MAX_CMAP_SIZE]; /* usage counts for each mapentry */ | |
54 int histogram[B_LEN][B_LEN][B_LEN]; | |
55 int num_active_colors; | |
56 Colorbox *freeboxes; /* used and freed internally */ | |
57 Colorbox *usedboxes; /* used and freed internally */ | |
58 C_cell **ColorCells; /* used and freed internally */ | |
59 } quant_table; | |
60 | |
61 #define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT]) | |
62 | |
63 quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors); | |
440 | 64 |
65 #endif /* INCLUDED_imgproc_h_ */ |