Attachment #861283 for bug #895898

View | Details | Raw Unified | Return to bug 895898
Collapse All | Expand All

Lines 1-9 Link Here

(-)a/src/gui/Makefile.am (-1 / +1 lines)
1	AM_CPPFLAGS = -I$(top_srcdir)/include	1	AM_CPPFLAGS = -I$(top_srcdir)/include
2		2
3	noinst_LIBRARIES = libgui.a	3	noinst_LIBRARIES = libgui.a
4	libgui_a_SOURCES = sdlmain.cpp sdl_mapper.cpp dosbox_logo.h \	4	libgui_a_SOURCES = sdlmain.cpp sdl_mapper.cpp cpp_compat.h dosbox_logo.h \
5	render.cpp render_scalers.cpp render_scalers.h \	5	render.cpp render_scalers.cpp render_scalers.h \
6	render_templates.h render_loops.h render_simple.h \	6	render_templates.h render_loops.h render_simple.h \
7	render_templates_sai.h render_templates_hq.h \	7	render_templates_sai.h render_templates_hq.h \
8	render_templates_hq2x.h render_templates_hq3x.h \	8	render_templates_hq2x.h render_templates_hq3x.h \
9	midi.cpp midi_win32.h midi_oss.h midi_coreaudio.h midi_alsa.h \	9	midi.cpp midi_win32.h midi_oss.h midi_coreaudio.h midi_alsa.h \

Lines 14-23 Link Here

(-)a/src/gui/render_templates_sai.h (-3 / +5 lines)
14	* You should have received a copy of the GNU General Public License along	14	* You should have received a copy of the GNU General Public License along
15	* with this program; if not, write to the Free Software Foundation, Inc.,	15	* with this program; if not, write to the Free Software Foundation, Inc.,
16	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17	*/	17	*/
18		18
		19	#include "cpp_compat.h"
		20
19	static inline int conc2d(GetResult,SBPP)(PTYPE A, PTYPE B, PTYPE C, PTYPE D) {	21	static inline int conc2d(GetResult,SBPP)(PTYPE A, PTYPE B, PTYPE C, PTYPE D) {
20	const bool ac = (A==C);	22	const bool ac = (A==C);
21	const bool bc = (B==C);	23	const bool bc = (B==C);
22	const int x1 = ac;	24	const int x1 = ac;
23	const int y1 = (bc & !ac);	25	const int y1 = (bc & !ac);
Lines 41-51 inline void conc2d(Super2xSaI,SBPP)(PTYP Link Here
41	if (C7 == C5 && C4 != C8) {	43	if (C7 == C5 && C4 != C8) {
42	line1[1] = line0[1] = C7;	44	line1[1] = line0[1] = C7;
43	} else if (C4 == C8 && C7 != C5) {	45	} else if (C4 == C8 && C7 != C5) {
44	line1[1] = line0[1] = C4;	46	line1[1] = line0[1] = C4;
45	} else if (C4 == C8 && C7 == C5) {	47	} else if (C4 == C8 && C7 == C5) {
46	register int r = 0;	48	REGISTER int r = 0;
47	r += conc2d(GetResult,SBPP)(C5,C4,C6,D1);	49	r += conc2d(GetResult,SBPP)(C5,C4,C6,D1);
48	r += conc2d(GetResult,SBPP)(C5,C4,C3,C1);	50	r += conc2d(GetResult,SBPP)(C5,C4,C3,C1);
49	r += conc2d(GetResult,SBPP)(C5,C4,D2,D5);	51	r += conc2d(GetResult,SBPP)(C5,C4,D2,D5);
50	r += conc2d(GetResult,SBPP)(C5,C4,C2,D4);	52	r += conc2d(GetResult,SBPP)(C5,C4,C2,D4);
51		53
Lines 125-135 inline void conc2d(SuperEagle,SBPP)(PTYP Link Here
125	line1[0] = interp_w2(C4,C7,3U,1U);	127	line1[0] = interp_w2(C4,C7,3U,1U);
126	} else {	128	} else {
127	line1[0] = interp_w2(C7,C8,1U,1U);	129	line1[0] = interp_w2(C7,C8,1U,1U);
128	}	130	}
129	} else {	131	} else {
130	register int r = 0;	132	REGISTER int r = 0;
131	r += conc2d(GetResult,SBPP)(C5,C4,C6,D1);	133	r += conc2d(GetResult,SBPP)(C5,C4,C6,D1);
132	r += conc2d(GetResult,SBPP)(C5,C4,C3,C1);	134	r += conc2d(GetResult,SBPP)(C5,C4,C3,C1);
133	r += conc2d(GetResult,SBPP)(C5,C4,D2,D5);	135	r += conc2d(GetResult,SBPP)(C5,C4,D2,D5);
134	r += conc2d(GetResult,SBPP)(C5,C4,C2,D4);	136	r += conc2d(GetResult,SBPP)(C5,C4,C2,D4);
135		137
Lines 183-193 inline void conc2d(_2xSaI,SBPP)(PTYPE * Link Here
183	if (C4 == C5) {	185	if (C4 == C5) {
184	line0[1] = C4;	186	line0[1] = C4;
185	line1[0] = C4;	187	line1[0] = C4;
186	line1[1] = C4;	188	line1[1] = C4;
187	} else {	189	} else {
188	register int r = 0;	190	REGISTER int r = 0;
189	r += conc2d(GetResult,SBPP)(C4,C5,C3,C1);	191	r += conc2d(GetResult,SBPP)(C4,C5,C3,C1);
190	r -= conc2d(GetResult,SBPP)(C5,C4,D4,C2);	192	r -= conc2d(GetResult,SBPP)(C5,C4,D4,C2);
191	r -= conc2d(GetResult,SBPP)(C5,C4,C6,D1);	193	r -= conc2d(GetResult,SBPP)(C5,C4,C6,D1);
192	r += conc2d(GetResult,SBPP)(C4,C5,D5,D2);	194	r += conc2d(GetResult,SBPP)(C4,C5,D5,D2);
193		195

Added Link Here

(-) (+10 lines)
1	#ifndef DOSBOX_CPP_COMPAT_H
2	#define DOSBOX_CPP_COMPAT_H
3
4	#if __cplusplus < 201703L
5	#define REGISTER register
6	#else
7	#define REGISTER
8	#endif
9
10	#endif

Return to bug 895898