Mercurial > hg > xemacs-beta
view src/imgproc.h @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 09 May 2015 00:40:57 +0100 |
parents | 2aa9cd456ae7 |
children | 574f0cded429 |
line wrap: on
line source
/* Image processing aux functions header file Copyright (C) 1998 Jareth Hein This file is a part of XEmacs XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef INCLUDED_imgproc_h_ #define INCLUDED_imgproc_h_ /* Synched up with: Not in FSF. */ /* Original author: Jareth Hein */ #define MAX_CMAP_SIZE 256 #define COLOR_DEPTH 8 #define MAX_COLOR 256 #define B_DEPTH 5 /* # bits/pixel to use */ #define B_LEN (1L<<B_DEPTH) #define C_DEPTH 2 #define C_LEN (1L<<C_DEPTH) /* # cells/color to use */ #define COLOR_SHIFT (COLOR_DEPTH-B_DEPTH) typedef struct colorbox { struct colorbox *next, *prev; int rmin, rmax; int gmin, gmax; int bmin, bmax; int total; } Colorbox; typedef struct { int num_ents; int entries[MAX_CMAP_SIZE][2]; } C_cell; typedef struct { unsigned short rm[MAX_CMAP_SIZE], gm[MAX_CMAP_SIZE], bm[MAX_CMAP_SIZE]; /* map values */ int um[MAX_CMAP_SIZE]; /* usage counts for each mapentry */ int histogram[B_LEN][B_LEN][B_LEN]; int num_active_colors; Colorbox *freeboxes; /* used and freed internally */ Colorbox *usedboxes; /* used and freed internally */ C_cell **ColorCells; /* used and freed internally */ } quant_table; #define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT]) quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors); #endif /* INCLUDED_imgproc_h_ */