Changeset 514Tweet

Timestamp:

Nov 18, 2005, 11:46:53 AM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Fixed remaining warnings with gcc 3.x and 4.x

Location:

libcaca/trunk/examples

Files:

• aafire.c (modified) (3 diffs)
• cacaball.c (modified) (1 diff)
• cacamoir.c (modified) (2 diffs)
• cacaplas.c (modified) (1 diff)

libcaca/trunk/examples/aafire.c

@@ -93 +93 @@
   int i;
 #ifdef LIBCACA
-  int r[256], g[256], b[256], a[256];
+  unsigned int r[256], g[256], b[256], a[256];
 #endif
 
@@ -178 +178 @@
   i = 0;
 #define END (bitmap + XSIZ * YSIZ)
-  for (p = bitmap; p <= (unsigned char *) (END); p += 1)
+  for (p = (unsigned char*)bitmap; 
+       (char*)p <= (( char *) (END)); 
+       p += 1)
     {
       *p = table[(*(p + XSIZ - 1) + *(p + XSIZ + 1) + *(p + XSIZ)) +
@@ -206 +208 @@
   i1 = 1;
   i2 = 4 * XSIZ + 1;
-  for (p = (char *) bitmap + XSIZ * (YSIZ + 0);
+  for (p = (unsigned char *) bitmap + XSIZ * (YSIZ + 0);
        p < ((unsigned char *) bitmap + XSIZ * (YSIZ + 1));
        p++, i1 += 4, i2 -= 4)

libcaca/trunk/examples/cacaball.c

@@ -53 +53 @@
 int main(int argc, char **argv)
 {
-    int r[256], g[256], b[256], a[256];
+    unsigned int r[256], g[256], b[256], a[256];
     float d[METABALLS], di[METABALLS], dj[METABALLS], dk[METABALLS];
     unsigned int x[METABALLS], y[METABALLS];

libcaca/trunk/examples/cacamoir.c

@@ -45 +45 @@
 int main (int argc, char **argv)
 {
-    int red[256], green[256], blue[256], alpha[256];
+    unsigned int red[256], green[256], blue[256], alpha[256];
     struct caca_bitmap *bitmap;
     int i, x, y, frame = 0, pause = 0;
@@ -119 +119 @@
 static void put_disc(int x, int y)
 {
-    char *src = disc + (DISCSIZ / 2 - x) + (DISCSIZ / 2 - y) * DISCSIZ;
+    char *src = ((char*)disc) + (DISCSIZ / 2 - x) + (DISCSIZ / 2 - y) * DISCSIZ;
     int i, j;
 

libcaca/trunk/examples/cacaplas.c

@@ -48 +48 @@
 int main (int argc, char **argv)
 {
-    int red[256], green[256], blue[256], alpha[256];
+    unsigned int red[256], green[256], blue[256], alpha[256];
     double r[3], R[6];
     struct caca_bitmap *bitmap;