156 lines
7 KiB
Diff
156 lines
7 KiB
Diff
--- allegro-4.0.3/tools/textconv.c.gcc4 2003-04-19 03:06:49.000000000 -0400
|
|
+++ allegro-4.0.3/tools/textconv.c 2005-05-25 09:32:42.000000000 -0400
|
|
@@ -190,7 +190,7 @@
|
|
if (out_flip)
|
|
c = ((c&0xFF)<<8) | ((c&0xFF00)>>8);
|
|
|
|
- size = out_type->u_setc(buf, c);
|
|
+ size = out_type->u_setc((char *)buf, c);
|
|
|
|
for (i=0; i<size; i++) {
|
|
if (flag_c) {
|
|
--- allegro-4.0.3/src/c/cstretch.c.gcc4 2003-04-19 03:06:47.000000000 -0400
|
|
+++ allegro-4.0.3/src/c/cstretch.c 2005-05-25 09:36:17.000000000 -0400
|
|
@@ -34,14 +34,14 @@
|
|
*/
|
|
#define DECLARE_STRETCHER(type, size, set, get) \
|
|
int dd = _al_stretch.dd; \
|
|
-type *s = (type*) sptr; \
|
|
+unsigned char *s = (unsigned char*) sptr; \
|
|
unsigned long d = dptr; \
|
|
unsigned long dend = d + _al_stretch.dw; \
|
|
-for (; d < dend; d += (size), (unsigned char*) s += _al_stretch.sinc) { \
|
|
- set(d, get(s)); \
|
|
- if (dd >= 0) \
|
|
- (unsigned char*) s += (size), dd += _al_stretch.i2; \
|
|
- else \
|
|
+for (; d < dend; d += (size), s += _al_stretch.sinc) { \
|
|
+ set(d, get((type*) s)); \
|
|
+ if (dd >= 0) { \
|
|
+ s += (size), dd += _al_stretch.i2; \
|
|
+ } else \
|
|
dd += _al_stretch.i1; \
|
|
}
|
|
|
|
@@ -127,15 +127,15 @@
|
|
*/
|
|
#define DECLARE_MASKED_STRETCHER(type, size, set, get, mask) \
|
|
int dd = _al_stretch.dd; \
|
|
-type *s = (type*) sptr; \
|
|
+unsigned char *s = (unsigned char*) sptr; \
|
|
unsigned long d = dptr; \
|
|
unsigned long dend = d + _al_stretch.dw; \
|
|
-for (; d < dend; d += (size), (unsigned char*) s += _al_stretch.sinc) { \
|
|
- unsigned long color = get(s); \
|
|
+for (; d < dend; d += (size), s += _al_stretch.sinc) { \
|
|
+ unsigned long color = get((type*) s); \
|
|
if (color != (mask)) \
|
|
set(d, color); \
|
|
if (dd >= 0) \
|
|
- (unsigned char*) s += (size), dd += _al_stretch.i2; \
|
|
+ s += (size), dd += _al_stretch.i2; \
|
|
else \
|
|
dd += _al_stretch.i1; \
|
|
}
|
|
--- allegro-4.0.3/src/sound.c.gcc4 2003-04-19 03:06:47.000000000 -0400
|
|
+++ allegro-4.0.3/src/sound.c 2005-05-25 09:32:42.000000000 -0400
|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
|
|
|
-extern DIGI_DRIVER digi_none;
|
|
+static DIGI_DRIVER digi_none;
|
|
|
|
|
|
|
|
--- allegro-4.0.3/src/x/xwin.c.gcc4 2003-04-19 03:06:49.000000000 -0400
|
|
+++ allegro-4.0.3/src/x/xwin.c 2005-05-25 09:32:42.000000000 -0400
|
|
@@ -765,7 +765,7 @@
|
|
_xwin.fast_visual_depth = _xwin_private_fast_visual_depth();
|
|
|
|
/* Create screen bitmap from frame buffer. */
|
|
- return _xwin_private_create_screen_bitmap(drv, 0, _xwin.ximage->data + _xwin.ximage->xoffset,
|
|
+ return _xwin_private_create_screen_bitmap(drv, 0, (unsigned char *)(_xwin.ximage->data + _xwin.ximage->xoffset),
|
|
_xwin.ximage->bytes_per_line);
|
|
}
|
|
|
|
@@ -1400,7 +1400,7 @@
|
|
return 0;
|
|
|
|
/* Use first line of XImage for test. */
|
|
- p8 = _xwin.ximage->data + _xwin.ximage->xoffset;
|
|
+ p8 = (unsigned char *)(_xwin.ximage->data + _xwin.ximage->xoffset);
|
|
p16 = (unsigned short*) p8;
|
|
p32 = (unsigned long*) p8;
|
|
|
|
@@ -2989,7 +2989,7 @@
|
|
XF86DGASetViewPort(_xwin.display, _xwin.screen, 0, 0);
|
|
|
|
/* Create screen bitmap from frame buffer. */
|
|
- return _xwin_private_create_screen_bitmap(drv, 1, fb_addr + offset_y * fb_width + offset_x * (_xwin.fast_visual_depth / 8), fb_width);
|
|
+ return _xwin_private_create_screen_bitmap(drv, 1, (unsigned char *)(fb_addr + offset_y * fb_width + offset_x * (_xwin.fast_visual_depth / 8)), fb_width);
|
|
}
|
|
|
|
BITMAP *_xdga_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen)
|
|
--- allegro-4.0.3/src/fli.c.gcc4 2003-04-19 03:06:47.000000000 -0400
|
|
+++ allegro-4.0.3/src/fli.c 2005-05-25 09:32:42.000000000 -0400
|
|
@@ -184,16 +184,16 @@
|
|
|
|
|
|
/* helpers for reading FLI chunk data */
|
|
-#define READ_BYTE_NC(p) (*((unsigned char *)(p))++)
|
|
-#define READ_CHAR_NC(p) (*((signed char *)(p))++)
|
|
+#define READ_BYTE_NC(p) (((unsigned char *)(p))[0]++)
|
|
+#define READ_CHAR_NC(p) (((signed char *)(p))[0]++)
|
|
|
|
#if (defined ALLEGRO_GCC) && (defined ALLEGRO_I386)
|
|
|
|
/* for gcc on i386 */
|
|
-#define READ_WORD_NC(p) (*((unsigned short *)(p))++)
|
|
-#define READ_SHORT_NC(p) (*((signed short *)(p))++)
|
|
-#define READ_ULONG_NC(p) (*((unsigned long *)(p))++)
|
|
-#define READ_LONG_NC(p) (*((signed long *)(p))++)
|
|
+#define READ_WORD_NC(p) (((unsigned short *)(p))[0]++)
|
|
+#define READ_SHORT_NC(p) (((signed short *)(p))[0]++)
|
|
+#define READ_ULONG_NC(p) (((unsigned long *)(p))[0]++)
|
|
+#define READ_LONG_NC(p) (((signed long *)(p))[0]++)
|
|
|
|
#else
|
|
|
|
@@ -289,16 +289,16 @@
|
|
* sz is a size of chunk after subtructing size bytes (known to be < 0)
|
|
* size is how much bytes we need
|
|
* (size + sz) is how much bytes is left in chunk */
|
|
-#define FLI_KLUDGE(p,sz,size) \
|
|
-{ \
|
|
- if (((size) + (sz)) <= 0) { \
|
|
- memset(_fli_broken_data, 0, (size)); \
|
|
- } \
|
|
- else { \
|
|
- memcpy(_fli_broken_data, (p), (size) + (sz)); \
|
|
- memset(_fli_broken_data + (size) + (sz), 0, -(sz)); \
|
|
- } \
|
|
- (p) = _fli_broken_data; \
|
|
+inline void FLI_KLUDGE(char *p,int sz, int size)
|
|
+{
|
|
+ if (size + sz <= 0) {
|
|
+ memset(_fli_broken_data, 0, size);
|
|
+ }
|
|
+ else {
|
|
+ memcpy(_fli_broken_data, p, size + sz);
|
|
+ memset(_fli_broken_data + size + sz, 0, -sz);
|
|
+ }
|
|
+ p = _fli_broken_data;
|
|
}
|
|
|
|
|
|
--- allegro-4.0.3/examples/exspline.c.gcc4 2003-04-19 03:06:46.000000000 -0400
|
|
+++ allegro-4.0.3/examples/exspline.c 2005-05-25 09:32:42.000000000 -0400
|
|
@@ -84,6 +84,7 @@
|
|
|
|
n.x = node.x - (prev.x - node.x) / 8;
|
|
n.y = node.y - (prev.y - node.y) / 8;
|
|
+ n.tangent = 0;
|
|
|
|
return n;
|
|
}
|