Commit graph

289 commits

Author SHA1 Message Date
Kp 26544682e0 Cache COLOR 2015-01-29 04:27:37 +00:00
Kp ff4a0ccd70 Fix RAIIdmem array usage
Some RAIIdmem instances managed a T[], but were declared to manage a T.
2015-01-28 03:42:53 +00:00
Kp 06142a6c80 Optimize gr_remap_bitmap_good integer handling 2015-01-25 05:32:45 +00:00
Kp fa73ca8a17 Pass gr_remap_bitmap_good arg by & 2015-01-25 05:32:45 +00:00
Kp f2797ddf1e Pass gr_init_canvas arg by & 2015-01-17 18:31:40 +00:00
Kp fccb6814f8 Pass gr_create_sub_canvas arg by & 2015-01-17 18:31:40 +00:00
Kp c731558a94 Pass gr_init_sub_canvas arg by & 2015-01-17 18:31:40 +00:00
Kp af16e4a2a3 Tighten grs_bitmap resource rules 2015-01-17 18:31:40 +00:00
Kp 20edba1fd1 Use gr_init_canvas in gr_create_canvas 2015-01-17 04:31:17 +00:00
Kp 266814e975 Inline gr_set_current_canvas with constant inputs 2015-01-12 00:26:03 +00:00
Kp bd6b9489c1 Fix off-by-one end causing memory corruption 2014-12-08 00:41:03 +00:00
Kp bb8445f70c Fix some -Wsign-compare warnings 2014-12-05 04:11:37 +00:00
Kp 0dfbe46318 Rewrite scale_line to use std::fill
Eliminate inline byte-by-byte store.
2014-12-05 04:11:37 +00:00
Kp 97718e9b9c Refactor gr_ubitmap012 2014-12-05 04:11:37 +00:00
Kp 58c9c98124 Rewrite gr_linear_rep_movsdm with std::transform
Eliminate deprecated register.
2014-12-05 04:11:37 +00:00
Kp 3097a5b247 Pass gr_bitblt_find_transparent_area arg by & 2014-12-02 03:35:01 +00:00
Kp c990701d87 Pass show_fullscr arg by & 2014-12-02 03:35:01 +00:00
Kp c89e3b7452 Pass gr_bitmapm arg as & 2014-12-02 03:35:01 +00:00
Kp 355df375a0 Pass gr_bitmap arg as & 2014-12-02 03:35:01 +00:00
Kp 5955bac683 Pass gr_bitmap_scale_to arg by & 2014-12-02 03:35:01 +00:00
Kp 6334327ccc Remove unused gr_bm_bitblt 2014-12-02 03:35:01 +00:00
Kp 0375876a08 Pass gr_bm_ubitbltm arg by & 2014-12-02 03:35:01 +00:00
Kp 25948a4b96 Pass gr_bm_ubitblt00m arg by & 2014-12-02 03:35:01 +00:00
Kp 31d6b151da Pass gr_bm_ubitblt arg by & 2014-12-02 03:35:01 +00:00
Kp 50e24ee0ef Pass gr_bm_ubitblt00 arg by & 2014-12-02 03:35:01 +00:00
Kp 15f9d5d3f5 Pass ogl_ubitblt arg by & 2014-12-02 03:35:01 +00:00
Kp 7031c809fc Pass gr_ubitmapm arg by & 2014-12-02 03:35:01 +00:00
Kp 5eddc2c197 Make bitmap bm_data const where easy 2014-12-02 03:24:38 +00:00
Kp ea535b0e38 Pass gr_rle_expand_scanline arg as const 2014-11-30 22:09:22 +00:00
Kp 706782b275 Pass gr_rle_getsize arg as const 2014-11-30 22:09:22 +00:00
Kp 87b8721f0a Replace gr_linear_stosd with macro 2014-11-30 22:09:22 +00:00
Kp fd0b7acf53 Pass gr_bm_ubitblt0x_rle arg by & 2014-11-30 22:09:22 +00:00
Kp 9b2ef9cfa4 Pass gr_rle_expand_scanline_generic arg by & 2014-11-30 22:09:22 +00:00
Kp 63cbff3b82 Pass gr_bm_ubitblt00m_rle arg by & 2014-11-30 22:09:22 +00:00
Kp 96acf9edec Pass gr_ubitmap00 arg by & 2014-11-30 22:09:22 +00:00
Kp 2697918223 Pass gr_bm_pixel arg by & 2014-11-30 22:09:22 +00:00
Kp 0b1aa34c43 Pass gr_set_super_transparent arg by &
Flip name of the boolean to match its function.
2014-11-30 22:09:21 +00:00
Kp 26f4aaa51b Pass gr_set_transparent arg by & 2014-11-30 22:09:21 +00:00
Kp e5acd8056d Pass gr_set_bitmap_flags arg by & 2014-11-30 22:09:21 +00:00
Kp cb939f32e0 Simplify decode_data 2014-11-30 22:09:21 +00:00
Kp efa7566821 Pass colormap as array<> 2014-11-30 22:09:21 +00:00
Kp d0abc13c94 Pass gr_create_sub_bitmap arg by & 2014-11-30 22:09:21 +00:00
Kp ef539be1ab Pass gr_init_bitmap_data arg by & 2014-11-30 22:09:21 +00:00
Kp f6dde1c593 Pass gr_init_bitmap_alloc arg by & 2014-11-30 22:09:21 +00:00
Kp 53ce29e789 Pass gr_init_bitmap arg by & 2014-11-30 22:09:20 +00:00
Kp 594c597621 Pass gr_init_bitmap_data arg by & 2014-11-30 22:09:20 +00:00
Kp 0672cdff1b Pass gr_set_bitmap_data grs_bitmap by & 2014-11-30 22:09:20 +00:00
Kp 97332b848c Pass gr_free_bitmap_data arg by & 2014-11-30 22:09:20 +00:00
Kp 0236c237ed Pass ogl_freebmtexture arg by & 2014-11-30 22:09:20 +00:00
Kp bba9d90347 Use subscript notation in grs_bitmap bm_data 2014-11-30 22:09:19 +00:00
Kp 0790eda153 Use new/delete for grs_screen 2014-11-30 22:09:19 +00:00
Kp b4acc5b858 Pass gr_ubitmap arg by & 2014-11-30 22:09:19 +00:00
Kp a035d813ea Pass gr_ubitmapGENERIC arg by & 2014-11-30 22:09:19 +00:00
Kp d2ce12c616 Pass gr_ubitmap012 arg by & 2014-11-30 22:09:18 +00:00
Kp 166f15617d Pass ogl_ubitmapm_cs arg by & 2014-11-30 22:09:18 +00:00
Kp 4cadc18e52 Pass merge_textures_new arg by & 2014-11-30 22:09:18 +00:00
Kp 968f7ddc97 Pass gr_gpixel arg by & 2014-11-30 22:09:18 +00:00
Kp ad3a240958 Pass ogl_ugpixel arg by & 2014-11-30 22:09:18 +00:00
Kp dd4a0db47f Pass rle_expand_texture arg as const & 2014-11-30 22:09:17 +00:00
Kp 62ebfe9626 Pass rle_expand_texture_sub arg by & 2014-11-30 22:09:17 +00:00
Kp 06b384e349 Pass scale_bitmap arg by & 2014-11-30 22:09:17 +00:00
Kp 4ad784028b Pass scale_bitmap points in array<grs_point, 3> 2014-11-21 03:34:50 +00:00
Kp c2544fe0d9 Move scale decoding array to local scope 2014-11-21 03:33:10 +00:00
Kp 0c76e47f59 Move rle decoding pointers to local scope 2014-11-21 03:32:25 +00:00
Kp 4eaf0ac4c3 Pass scale_up* bitmap arg by & 2014-11-19 04:18:12 +00:00
Kp 8c4fd12a82 Pass decode_row arg by & 2014-11-19 04:16:02 +00:00
Kp ee8da79953 Simplify rle_remap offset setup 2014-11-19 04:14:33 +00:00
Kp 60d4b91782 Simplify rle_swap_0_255 offset setup 2014-11-19 04:14:10 +00:00
Kp 501f5e8557 Narrow some graphics parameters 2014-11-15 03:31:41 +00:00
Kp 2df4bea9b5 Use range_for in rle 2014-11-15 03:10:09 +00:00
Kp 9baeb31162 Pass rle_end arg by & 2014-11-13 03:41:38 +00:00
Kp dc772c693d Remove unused gr_bitblt_double mode 2014-11-12 03:48:22 +00:00
Kp e756f37b0f Trap bitmap coordinate overflow 2014-11-12 03:43:44 +00:00
Kp fa136e7812 Drop redundant gr_set_bitmap_data in gr_init_bitmap_alloc 2014-11-12 03:22:20 +00:00
Kp c704cc9fc9 Add const void* conversion to various types
Add operator const void*() to prevent accidental use of pointer
comparison.  With the overload present, comparing two objects triggers
an ambiguous conversion to pointer, instead of comparing the pointer
values.
2014-10-12 22:11:28 +00:00
Kp 25597f2328 Propagate for variables in common/2d/scalec.cpp 2014-09-26 02:42:14 +00:00
Kp ea5be05645 Propagate for variables in common/2d/rle.cpp 2014-09-26 02:42:14 +00:00
Kp d869b08e27 Propagate for variables in common/2d/rect.cpp 2014-09-26 02:42:14 +00:00
Kp 2664f2475c Propagate for variables in common/2d/line.cpp 2014-09-26 02:42:14 +00:00
Kp d81c49a433 Propagate for variables in common/2d/box.cpp 2014-09-26 02:42:13 +00:00
Kp 66f4155a5f Propagate for variables in common/2d/bitmap.cpp 2014-09-26 02:42:13 +00:00
Kp b3c5421a46 Propagate for variables in common/2d/bitblt.cpp 2014-09-26 02:42:13 +00:00
Kp e22923e004 Use unique_ptr for grs_canvas 2014-09-17 02:45:12 +00:00
Kp ff31905181 Use unique_ptr for grs_subcanvas 2014-09-07 19:04:06 +00:00
Kp 8d835f8e34 Reduce inclusion of compiler-begin.h 2014-08-24 03:36:35 +00:00
Kp 4d4dbab52f Use std::swap to implement EXCHG 2014-08-16 04:18:41 +00:00
Kp b276590998 Change gr_fade_table to array<array<>> 2014-08-08 02:50:27 +00:00
Kp f47aa29cd9 Use color_t for color values 2014-08-08 02:07:47 +00:00
Kp de56714572 Optimize gr_ubox0 2014-07-30 03:12:52 +00:00
Kp 9778c1a151 Use unique_ptr to manage sub bitmaps 2014-07-22 23:48:24 +00:00
Kp 323e796cd0 Use unique_ptr to manage grs_bitmap 2014-07-22 23:48:24 +00:00
Matt Vandermeulen 28f307eb85 Fixes #5 - Byteswap header renamed to byteutil, plus sed magic
[Kp: switch to #pragma for byteutil.h]
2014-07-03 02:03:08 +00:00
Kp d8a1971769 Decode transparent RLE in pieces 2014-07-01 02:30:39 +00:00
Kp b6033c49f2 Use unsigned transparent bitmap bounds 2014-07-01 01:34:16 +00:00
Kp 3abc33d6cc Optimize gr_rle_decode 2014-06-30 23:56:51 +00:00
zico ad7cb106bc Changed custom D1X license to GPLv3 2014-06-01 19:55:23 +02:00
Kp 073f00974a Eliminate uses of the typedef struct X { ... } X; pattern
C++ does not require this pattern.

import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
	m = to.match(line)
	if m:
		osn = m.group(1)
		print 'struct %s\n{' % osn
		continue
	if osn:
		m = tc.match(line)
		if m:
			csn = m.group(2)
			if osn == csn:
				print '}%s;' % m.group(1)
				osn = None
				continue
			else:
				osn = None
	print line,
2013-12-28 22:48:07 +00:00
Kp b1c5307eb1 Use array for palette_array_t 2013-12-22 00:37:36 +00:00
Kp a3d66a3b37 Add typedef palette_array_t for palette data 2013-12-22 00:05:13 +00:00
Kp 3b9b5ebfb0 Use RAII to manage function-local heap objects 2013-12-08 19:04:52 +00:00
Kp 9de54cfa74 Switch to C++ linkage
import fileinput
guard = 0
cxxguard = '#ifdef __cplusplus\n'
for line in fileinput.input(inplace=True):
	if line == cxxguard:
		guard = 1
		continue
	if guard:
		if line == 'extern "C" {\n':
			guard = 2
			continue
		if line == '}\n':
			guard = 0
			continue
		if guard == 2:
			assert(line == '#endif\n')
			guard = 0
			print cxxguard,
			continue
	print line,
2013-12-06 03:35:32 +00:00
Kp 2714679284 Mark private functions static 2013-11-02 04:23:55 +00:00
Kp b4107e6526 Remove duplicate declarations 2013-10-03 03:11:52 +00:00
Kp c58c4e4d06 Move declarations to headers 2013-10-03 03:11:52 +00:00
Kp f9899a9f20 Mark various functions static 2013-10-03 03:11:51 +00:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp c02a249263 Make gr_bitmap_scale_to static 2013-08-07 02:42:25 +00:00
Kp 68d3b08ef9 Remove unused function gr_rle_expand_scanline_generic_masked 2013-08-07 02:33:18 +00:00
Kp 1259006db5 Move common/2d/scalec.c -> common/2d/scalec.cpp 2013-07-27 22:30:54 +00:00
Kp 18a42e3e40 Move common/2d/rle.c -> common/2d/rle.cpp 2013-07-27 22:30:54 +00:00
Kp a334ad0ab1 Move common/2d/rect.c -> common/2d/rect.cpp 2013-07-27 22:30:54 +00:00
Kp 63acd159cc Move common/2d/pixel.c -> common/2d/pixel.cpp 2013-07-27 22:30:54 +00:00
Kp c80a824136 Move common/2d/line.c -> common/2d/line.cpp 2013-07-27 22:30:54 +00:00
Kp 5832f0dbd9 Move common/2d/gpixel.c -> common/2d/gpixel.cpp 2013-07-27 22:30:54 +00:00
Kp 139a80b925 Move common/2d/disc.c -> common/2d/disc.cpp 2013-07-27 22:30:54 +00:00
Kp 46d02518bc Move common/2d/circle.c -> common/2d/circle.cpp 2013-07-27 22:30:54 +00:00
Kp b7abe1d77e Move common/2d/canvas.c -> common/2d/canvas.cpp 2013-07-27 22:30:54 +00:00
Kp 6169fc5abc Move common/2d/box.c -> common/2d/box.cpp 2013-07-27 22:30:54 +00:00
Kp f7a030483f Move common/2d/bitmap.c -> common/2d/bitmap.cpp 2013-07-27 22:30:53 +00:00
Kp c2895e5176 Move common/2d/bitblt.c -> common/2d/bitblt.cpp 2013-07-27 22:30:53 +00:00
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp d78fd3561b Move bitmap clipping to eliminate warning 2013-06-23 04:34:40 +00:00
Kp a10dbc7d4b Move 2d/2dsline.c -> 2d/2dsline.cpp 2012-11-11 22:12:51 +00:00
Kp 2e3159a15f Mark gr 2dsline functions static 2013-06-14 03:40:50 +00:00
Kp 5648874a37 Merge branch d2x-rebirth/master into unification/master 2013-06-14 03:31:59 +00:00
Kp 26cfa7b39c Move */2d/2dsline.c -> common/2d/2dsline.c 2013-03-03 01:03:33 +00:00
Kp 9951b893ab Move */2d/bitblt.c -> common/2d/bitblt.c 2013-03-03 01:03:33 +00:00
Kp cc67fd23a2 Move */2d/bitmap.c,bitmap.h -> common/2d/bitmap.c,bitmap.h
Modify */2d/font.c to find the moved bitmap.h
2013-03-03 01:03:33 +00:00
Kp ccd1268e9d Move */2d/box.c -> common/2d/box.c 2013-03-03 01:03:33 +00:00
Kp 733c0f34da Move */2d/canvas.c -> common/2d/canvas.c 2013-03-03 01:03:33 +00:00
Kp 016c2a44f5 Move */2d/circle.c -> common/2d/circle.c 2013-03-03 01:03:33 +00:00
Kp 55cb06f45f Move */2d/disc.c -> common/2d/disc.c 2013-03-03 01:03:33 +00:00
Kp 4adefcdfa1 Move */2d/gpixel.c -> common/2d/gpixel.c 2013-03-03 01:03:33 +00:00
Kp 2d84c85915 Move */2d/clip.h,line.c -> common/2d/clip.h,line.c 2013-03-03 01:03:33 +00:00
Kp 2e7c092bb0 Move */2d/pixel.c -> common/2d/pixel.c 2013-03-03 01:03:33 +00:00
Kp 11f7182d45 Move */2d/poly.c -> common/2d/poly.c 2013-03-03 01:03:33 +00:00
Kp 54c847a88b Move */2d/rect.c -> common/2d/rect.c 2013-03-03 01:03:33 +00:00
Kp 902e068d1c Move */2d/rle.c -> common/2d/rle.c 2013-03-03 01:03:33 +00:00
Kp 227d1377fa Move */2d/scalec.c -> common/2d/scalec.c 2013-03-03 01:03:33 +00:00