Mercurial > hg > xemacs-beta
annotate nt/tiff.mak @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
parents | 03ab78e48ef6 |
children | ba07c880114a |
rev | line source |
---|---|
4894
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
1 ## TIFF makefile for Microsoft nmake |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
2 ## Copyright (C) 2001 Ben Wing. |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
3 |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
4 ## This file is part of XEmacs. |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
5 |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
6 ## XEmacs is free software; you can redistribute it and/or modify it |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
7 ## under the terms of the GNU General Public License as published by the |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
8 ## Free Software Foundation; either version 2, or (at your option) any |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
9 ## later version. |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
10 |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
11 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
12 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
13 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
14 ## for more details. |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
15 |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
16 ## You should have received a copy of the GNU General Public License |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
17 ## along with XEmacs; see the file COPYING. If not, write to |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
18 ## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
19 ## Boston, MA 02110-1301, USA. |
03ab78e48ef6
Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents:
318
diff
changeset
|
20 |
318 | 21 !if !defined(DEBUG_XEMACS) |
22 DEBUG_XEMACS=0 | |
23 !endif | |
24 | |
25 !if $(DEBUG_XEMACS) | |
26 OPT=-Od -Zi | |
27 !else | |
28 OPT=-O2 -G5 | |
29 !endif | |
30 | |
31 WARN_CPP_FLAGS = -W3 | |
32 CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) -c | |
33 | |
34 OUTDIR=.\WinRel | |
35 OBJDIR=.\WinRel | |
36 # the following is because fax3sm.c references "tiff.h" and "tif_fax3.h", | |
37 # under the assumption that those header files are in the same directory | |
38 # as fax3sm.c But, since we're using a special fax3sm.c file, and we | |
39 # can't be sure the user has patch to change "xx" to "..\..\libtiff\xx", | |
40 # let's just copy these header files to this directory. (Symbolic links | |
41 # would be _so_ nice) | |
42 NEED_FOR_COMPILE= tiff.h tif_fax3.h | |
43 | |
44 CPP=cl.exe | |
45 CPP_PROJ= /GX /YX /I "." /I ".." /D "WIN32" /D "NDEBUG" /D\ | |
46 "_WINDOWS" /FR$(OBJDIR)/ /Fp$(OUTDIR)/"libtiff.pch" $(CFLAGS) | |
47 | |
48 BSC32=bscmake.exe | |
49 BSC32_FLAGS=/nologo /o$(OUTDIR)/libtiff.bsc | |
50 | |
51 LIB32=lib.exe | |
52 LIB32_FLAGS=/NOLOGO /OUT:$(OUTDIR)\libtiff.lib | |
53 DEF_FLAGS= | |
54 DEF_FILE= | |
55 | |
56 BSC32_SBRS= \ | |
57 $(OBJDIR)\tif_jpeg.sbr \ | |
58 $(OBJDIR)\tif_dirinfo.sbr \ | |
59 $(OBJDIR)\tif_win32.sbr \ | |
60 $(OBJDIR)\tif_flush.sbr \ | |
61 $(OBJDIR)\tif_thunder.sbr \ | |
62 $(OBJDIR)\tif_compress.sbr \ | |
63 $(OBJDIR)\tif_print.sbr \ | |
64 $(OBJDIR)\tif_dirread.sbr \ | |
65 $(OBJDIR)\tif_getimage.sbr \ | |
66 $(OBJDIR)\tif_fax3.sbr \ | |
67 $(OBJDIR)\tif_version.sbr \ | |
68 $(OBJDIR)\tif_codec.sbr \ | |
69 $(OBJDIR)\tif_dir.sbr \ | |
70 $(OBJDIR)\tif_predict.sbr \ | |
71 $(OBJDIR)\tif_close.sbr \ | |
72 $(OBJDIR)\tif_dumpmode.sbr \ | |
73 $(OBJDIR)\tif_aux.sbr \ | |
74 $(OBJDIR)\tif_error.sbr \ | |
75 $(OBJDIR)\tif_lzw.sbr \ | |
76 $(OBJDIR)\tif_zip.sbr \ | |
77 $(OBJDIR)\tif_read.sbr \ | |
78 $(OBJDIR)\tif_packbits.sbr \ | |
79 $(OBJDIR)\tif_swab.sbr \ | |
80 $(OBJDIR)\tif_dirwrite.sbr \ | |
81 $(OBJDIR)\tif_open.sbr \ | |
82 $(OBJDIR)\tif_warning.sbr \ | |
83 $(OBJDIR)\tif_tile.sbr \ | |
84 $(OBJDIR)\tif_strip.sbr \ | |
85 $(OBJDIR)\tif_next.sbr \ | |
86 $(OBJDIR)\tif_write.sbr \ | |
87 $(OBJDIR)\fax3sm.sbr | |
88 | |
89 LIB32_OBJS= \ | |
90 $(OBJDIR)\tif_jpeg.obj \ | |
91 $(OBJDIR)\tif_dirinfo.obj \ | |
92 $(OBJDIR)\tif_win32.obj \ | |
93 $(OBJDIR)\tif_flush.obj \ | |
94 $(OBJDIR)\tif_thunder.obj \ | |
95 $(OBJDIR)\tif_compress.obj \ | |
96 $(OBJDIR)\tif_print.obj \ | |
97 $(OBJDIR)\tif_dirread.obj \ | |
98 $(OBJDIR)\tif_getimage.obj \ | |
99 $(OBJDIR)\tif_fax3.obj \ | |
100 $(OBJDIR)\tif_version.obj \ | |
101 $(OBJDIR)\tif_codec.obj \ | |
102 $(OBJDIR)\tif_dir.obj \ | |
103 $(OBJDIR)\tif_predict.obj \ | |
104 $(OBJDIR)\tif_close.obj \ | |
105 $(OBJDIR)\tif_dumpmode.obj \ | |
106 $(OBJDIR)\tif_aux.obj \ | |
107 $(OBJDIR)\tif_error.obj \ | |
108 $(OBJDIR)\tif_lzw.obj \ | |
109 $(OBJDIR)\tif_zip.obj \ | |
110 $(OBJDIR)\tif_read.obj \ | |
111 $(OBJDIR)\tif_packbits.obj \ | |
112 $(OBJDIR)\tif_swab.obj \ | |
113 $(OBJDIR)\tif_dirwrite.obj \ | |
114 $(OBJDIR)\tif_open.obj \ | |
115 $(OBJDIR)\tif_warning.obj \ | |
116 $(OBJDIR)\tif_tile.obj \ | |
117 $(OBJDIR)\tif_strip.obj \ | |
118 $(OBJDIR)\tif_next.obj \ | |
119 $(OBJDIR)\tif_write.obj \ | |
120 $(OBJDIR)\fax3sm.obj | |
121 | |
122 # nmake rule | |
123 | |
124 .SUFFIXES: | |
125 .SUFFIXES: .c .obj | |
126 | |
127 {..\..\libtiff}.c{$(OBJDIR)}.obj: | |
128 $(CPP) $(CPP_PROJ) $< -Fo$@ | |
129 | |
130 | |
131 ALL : $(OUTDIR)/libtiff.lib $(OUTDIR)/libtiff.bsc | |
132 | |
133 clean : | |
134 -del tiff.h | |
135 -del tif_fax3.h | |
136 -del t4.h | |
137 -del tiffcomp.h | |
138 -del tiffconf.h | |
139 -del tiffio.h | |
140 -del ..\..\libtiff\libtiff.lib | |
141 -del *.pdb | |
142 -del $(OBJDIR)\*.obj | |
143 -del $(OBJDIR)\*.sbr | |
144 -del $(OUTDIR)\libtiff.lib | |
145 -del $(OUTDIR)\libtiff.bsc | |
146 -del $(OUTDIR)\libtiff.pch | |
147 -rmdir $(OUTDIR) | |
148 | |
149 tiff.h : | |
150 if not exist ./tiff.h copy ..\..\libtiff\tiff.h . | |
151 tif_fax3.h : | |
152 if not exist ./tif_fax3.h copy ..\..\libtiff\tif_fax3.h . | |
153 | |
154 $(OUTDIR) : $(NEED_FOR_COMPILE) | |
155 if not exist $(OUTDIR)/nul mkdir $(OUTDIR) | |
156 | |
157 $(OUTDIR)/libtiff.bsc : $(OUTDIR) $(BSC32_SBRS) | |
158 $(BSC32) @<< | |
159 $(BSC32_FLAGS) $(BSC32_SBRS) | |
160 << | |
161 | |
162 $(OUTDIR)/libtiff.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS) | |
163 $(LIB32) @<< | |
164 $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) | |
165 << | |
166 copy $(OUTDIR)\libtiff.lib ..\..\libtiff\libtiff.lib | |
167 | |
168 DEP_FAX3S=\ | |
169 ..\..\libtiff\tiff.h \ | |
170 ..\..\libtiff\tif_fax3.h | |
171 $(OBJDIR)/fax3sm.obj : $(DEP_FAX3S) $(OBJDIR) | |
172 $(CPP) $(CPP_PROJ) .\fax3sm.c -Fo$@ | |
173 |