Ignore:
Timestamp:
Nov 10, 2005, 9:41:13 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • absolute shitloads of 64 bit fixes.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/scroller.cpp

    r4 r17  
    44
    55
    6 unsigned char hs_left_arrow[10*8]={
     6uint8_t hs_left_arrow[10*8]={
    77    0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
    88    0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0,
     
    1313
    1414
    15 unsigned char hs_right_arrow[10*8]={
     15uint8_t hs_right_arrow[10*8]={
    1616    0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
    1717    0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
     
    2222
    2323
    24 unsigned char vs_up_arrow[8*10]={
     24uint8_t vs_up_arrow[8*10]={
    2525    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 0,
    2626    0, 0, 0, 1, 1, 1, 1, 2, 0, 0, 1, 2, 1, 1, 2,
     
    3131
    3232
    33 unsigned char vs_down_arrow[8*10]={
     33uint8_t vs_down_arrow[8*10]={
    3434    0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 1, 1, 2, 0,
    3535    0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 0, 0, 1, 1, 2,
     
    3939    0, 0, 0, 0, 0};
    4040
    41 void show_icon(image *screen, window_manager *wm, int x, int y, int icw, int ich, unsigned char *buf)
     41void show_icon(image *screen, window_manager *wm, int x, int y, int icw, int ich, uint8_t *buf)
    4242{
    4343  short cx1,cy1,cx2,cy2;
    4444  screen->get_clip(cx1,cy1,cx2,cy2);
    45   unsigned char remap[3];
     45  uint8_t remap[3];
    4646  remap[0]=wm->medium_color();
    4747  remap[1]=wm->bright_color();
     
    5252    if (y>=cy1 && y<=cy2)
    5353    {
    54       unsigned char *sl=screen->scan_line(y)+x;
     54      uint8_t *sl=screen->scan_line(y)+x;
    5555      for (int xc=icw,xo=x;xc;xc--,xo++,sl++,buf++)
    5656      {
     
    8888int scroller::bw() { if (vert) return 12; else return 14; }
    8989
    90 unsigned char *scroller::b1()
     90uint8_t *scroller::b1()
    9191{
    9292  if (vert) return vs_up_arrow;
     
    9494}
    9595
    96 unsigned char *scroller::b2()
     96uint8_t *scroller::b2()
    9797{
    9898  if (vert) return vs_down_arrow;
     
    553553  if (m)
    554554  {
    555     select=(uchar *)jmalloc((t+7)/8,"selection bit array");
     555    select=(uint8_t *)jmalloc((t+7)/8,"selection bit array");
    556556    memset(select,0,(t+7)/8);
    557557  } else cur_sel=0;
Note: See TracChangeset for help on using the changeset viewer.