Mercurial > hg > xemacs-beta
annotate src/imgproc.h @ 5307:c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
src/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.c (Fexpand_abbrev):
* alloc.c:
* alloc.c (Fmake_list):
* alloc.c (Fmake_vector):
* alloc.c (Fmake_bit_vector):
* alloc.c (Fmake_byte_code):
* alloc.c (Fmake_string):
* alloc.c (vars_of_alloc):
* bytecode.c (UNUSED):
* bytecode.c (Fbyte_code):
* chartab.c (decode_char_table_range):
* cmds.c (Fself_insert_command):
* data.c (check_integer_range):
* data.c (Fnatnump):
* data.c (Fnonnegativep):
* data.c (Fstring_to_number):
* elhash.c (hash_table_size_validate):
* elhash.c (decode_hash_table_size):
* eval.c (Fbacktrace_frame):
* event-stream.c (lisp_number_to_milliseconds):
* event-stream.c (Faccept_process_output):
* event-stream.c (Frecent_keys):
* event-stream.c (Fdispatch_event):
* events.c (Fmake_event):
* events.c (Fevent_timestamp):
* events.c (Fevent_timestamp_lessp):
* events.h:
* events.h (struct command_builder):
* file-coding.c (gzip_putprop):
* fns.c:
* fns.c (check_sequence_range):
* fns.c (Frandom):
* fns.c (Fnthcdr):
* fns.c (Flast):
* fns.c (Fnbutlast):
* fns.c (Fbutlast):
* fns.c (Fmember):
* fns.c (Ffill):
* fns.c (Freduce):
* fns.c (replace_string_range_1):
* fns.c (Freplace):
* font-mgr.c (Ffc_pattern_get):
* frame-msw.c (msprinter_set_frame_properties):
* glyphs.c (check_valid_xbm_inline):
* indent.c (Fmove_to_column):
* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
* lisp.h:
* lisp.h (ARRAY_DIMENSION_LIMIT):
* lread.c (decode_mode_1):
* mule-ccl.c (ccl_get_compiled_code):
* number.h:
* process-unix.c (unix_open_multicast_group):
* process.c (Fset_process_window_size):
* profile.c (Fstart_profiling):
* unicode.c (Funicode_to_char):
Change NATNUMP to return 1 for positive bignums; changes uses of
it and of CHECK_NATNUM appropriately, usually by checking for an
integer in an appropriate range.
Add array-dimension-limit and use it in #'make-vector,
#'make-string. Add array-total-size-limit, array-rank-limit while
we're at it, for the sake of any Common Lisp-oriented code that
uses these limits.
Rename check_int_range to check_integer_range, have it take
Lisp_Objects (and thus bignums) instead.
Remove bignum_butlast(), just set int_n to an appropriately large
integer if N is a bignum.
Accept bignums in check_sequence_range(), change the functions
that use check_sequence_range() appropriately.
Move the definition of NATNUMP() to number.h; document why it's a
reasonable name, contradicting an old comment.
tests/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (wrong-type-argument):
* automated/mule-tests.el (featurep):
Check for args-out-of-range errors instead of wrong-type-argument
errors in various places when code is handed a large bignum
instead of a fixnum.
Also check for the wrong-type-argument errors when giving the same
code a non-integer value.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 20 Nov 2010 16:49:11 +0000 |
| parents | 8de8e3f6228a |
| children | 2aa9cd456ae7 |
| 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 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 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 | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 440 | 21 #ifndef INCLUDED_imgproc_h_ |
| 22 #define INCLUDED_imgproc_h_ | |
| 23 | |
| 428 | 24 /* Synched up with: Not in FSF. */ |
| 25 | |
| 26 /* Original author: Jareth Hein */ | |
| 27 | |
| 28 #define MAX_CMAP_SIZE 256 | |
| 29 #define COLOR_DEPTH 8 | |
| 30 #define MAX_COLOR 256 | |
| 31 | |
| 32 #define B_DEPTH 5 /* # bits/pixel to use */ | |
| 33 #define B_LEN (1L<<B_DEPTH) | |
| 34 | |
| 35 #define C_DEPTH 2 | |
| 36 #define C_LEN (1L<<C_DEPTH) /* # cells/color to use */ | |
| 37 | |
| 38 #define COLOR_SHIFT (COLOR_DEPTH-B_DEPTH) | |
| 39 | |
| 40 typedef struct colorbox { | |
| 41 struct colorbox *next, *prev; | |
| 42 int rmin, rmax; | |
| 43 int gmin, gmax; | |
| 44 int bmin, bmax; | |
| 45 int total; | |
| 46 } Colorbox; | |
| 47 | |
| 48 typedef struct { | |
| 49 int num_ents; | |
| 50 int entries[MAX_CMAP_SIZE][2]; | |
| 51 } C_cell; | |
| 52 | |
| 53 typedef struct { | |
| 54 unsigned short rm[MAX_CMAP_SIZE], gm[MAX_CMAP_SIZE], bm[MAX_CMAP_SIZE]; /* map values */ | |
| 55 int um[MAX_CMAP_SIZE]; /* usage counts for each mapentry */ | |
| 56 int histogram[B_LEN][B_LEN][B_LEN]; | |
| 57 int num_active_colors; | |
| 58 Colorbox *freeboxes; /* used and freed internally */ | |
| 59 Colorbox *usedboxes; /* used and freed internally */ | |
| 60 C_cell **ColorCells; /* used and freed internally */ | |
| 61 } quant_table; | |
| 62 | |
| 63 #define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT]) | |
| 64 | |
| 65 quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors); | |
| 440 | 66 |
| 67 #endif /* INCLUDED_imgproc_h_ */ |