Changeset 513


Ignore:
Timestamp:
Nov 17, 2005, 3:33:43 PM (15 years ago)
Author:
Jean-Yves Lamoureux
Message:
  • Fixed warnings under GCC 4.x
Location:
libcaca/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/src/bitmap.c

    r512 r513  
    572572        unsigned int i;
    573573        int ch = 0, distmin;
    574         int r, g, b, a, fg_r = 0, fg_g = 0, fg_b = 0, bg_r, bg_g, bg_b;
     574        unsigned int r, g, b, a;
     575        int fg_r = 0, fg_g = 0, fg_b = 0, bg_r, bg_g, bg_b;
    575576        int fromx, fromy, tox, toy, myx, myy, dots, dist;
    576577        int error[3];
     
    711712        else
    712713        {
    713             int lum = r; if(g > lum) lum = g; if(b > lum) lum = b;
     714            unsigned int lum = r; if(g > lum) lum = g; if(b > lum) lum = b;
    714715            outfg = outbg;
    715716            outbg = CACA_COLOR_BLACK;
  • libcaca/trunk/src/graphics.c

    r512 r513  
    503503void caca_putstr(int x, int y, char const *s)
    504504{
    505     char *charbuf;
    506     char *attrbuf;
     505    unsigned char *charbuf;
     506    unsigned char *attrbuf;
    507507    char const *t;
    508508    unsigned int len;
     
    10231023        for(i = 0; i < 94; i++)
    10241024        {
    1025             glGenTextures(1, &id[i]);
     1025            glGenTextures(1, (GLuint*)&id[i]);
    10261026            glBindTexture(GL_TEXTURE_2D, id[i]);
    10271027            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     
    14031403                XDrawString(x11_dpy, x11_pixmap, x11_gc, x * x11_font_width,
    14041404                            (y + 1) * x11_font_height - x11_font_offset,
    1405                             cache_char + x + y * _caca_width, len);
     1405                            (char*)(cache_char + x + y * _caca_width), len);
    14061406            }
    14071407        }
Note: See TracChangeset for help on using the changeset viewer.