← Back to branch summary

~ubuntu-branches/ubuntu/quantal/vice/quantal

« back to all changes in this revision

Viewing changes to src/arch/riscos/video.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.1.7 upstream) (9.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090331003715-i5yisvcfv7mgz3eh
Tags: 2.1.dfsg-1
http://bugs.debian.org/495937
http://bugs.debian.org/501181
* New major upstream release (closes: #495937).
* Add desktop files (closes: #501181).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/riscos/video.c
646
646
          trans[i] = ct[i];
647
647
        }
648
648
      }
649
 
      for (; i<maxVideoCanvasColours; i++) trans[i] = 0;
 
649
      for (; i<(unsigned int)maxVideoCanvasColours; i++) trans[i] = 0;
650
650
    }
651
651
 
652
652
    canvas->fb.transdirty = 0;
1080
1080
  const palette_entry_t *p;
1081
1081
  unsigned int numsprpal;
1082
1082
  unsigned int *ct;
1083
 
  int i;
 
1083
  unsigned int i;
1084
1084
 
1085
1085
  if (palette == NULL) return 0;
1086
1086
 
1089
1089
    lib_free(canvas->current_palette);
1090
1090
  }
1091
1091
  canvas->num_colours = palette->num_entries;
1092
 
  if (canvas->num_colours > maxVideoCanvasColours)
 
1092
  if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
1093
1093
    canvas->num_colours = maxVideoCanvasColours;
1094
1094
 
1095
1095
  canvas->current_palette = lib_malloc((canvas->num_colours)*sizeof(int));
1185
1185
    canvas->height *= 2;
1186
1186
 
1187
1187
  canvas->num_colours = (canvas->palette == NULL) ? 16 : canvas->palette->num_entries;
1188
 
  if (canvas->num_colours > maxVideoCanvasColours)
 
1188
  if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
1189
1189
    canvas->num_colours = maxVideoCanvasColours;
1190
1190
  canvas->current_palette = NULL;
1191
1191
  canvas->shiftx = 0; canvas->shifty = 0; canvas->scale = 1;
1949
1949
 
1950
1950
void video_register_callbacks(void)
1951
1951
{
1952
 
  resources_register_callback("PALMode", callback_canvas_modified, NULL);
1953
1952
  resources_register_callback("PALEmuDepth", callback_canvas_modified, NULL);
1954
1953
  resources_register_callback("PALEmuDouble", callback_canvas_modified, NULL);
1955
1954
  resources_register_callback("UseBPlot", callback_canvas_modified, NULL);