minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source
This commit is contained in:
Wolfgang Denk 2010-07-17 20:49:59 +02:00
commit 293e3938d0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/cfb_console.c
View File

@ -1119,7 +1119,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
case 8: case 8:
padded_line -= width; padded_line -= width;
if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) { if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
/* Copy colormap */ /* Copy colormap */
for (xcount = 0; xcount < colors; ++xcount) { for (xcount = 0; xcount < colors; ++xcount) {
cte = bmp->color_table[xcount]; cte = bmp->color_table[xcount];
video_set_lut (xcount, cte.red, cte.green, cte.blue); video_set_lut (xcount, cte.red, cte.green, cte.blue);
@ -1321,11 +1321,11 @@ void logo_plot (void *screen, int width, int x, int y)
#ifdef CONFIG_VIDEO_BMP_LOGO #ifdef CONFIG_VIDEO_BMP_LOGO
source = bmp_logo_bitmap; source = bmp_logo_bitmap;
/* Allocate temporary space for computing colormap */ /* Allocate temporary space for computing colormap */
logo_red = malloc (BMP_LOGO_COLORS); logo_red = malloc (BMP_LOGO_COLORS);
logo_green = malloc (BMP_LOGO_COLORS); logo_green = malloc (BMP_LOGO_COLORS);
logo_blue = malloc (BMP_LOGO_COLORS); logo_blue = malloc (BMP_LOGO_COLORS);
/* Compute color map */ /* Compute color map */
for (i = 0; i < VIDEO_LOGO_COLORS; i++) { for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
logo_red[i] = (bmp_logo_palette[i] & 0x0f00) >> 4; logo_red[i] = (bmp_logo_palette[i] & 0x0f00) >> 4;
logo_green[i] = (bmp_logo_palette[i] & 0x00f0); logo_green[i] = (bmp_logo_palette[i] & 0x00f0);

2
include/video_fb.h
View File

@ -1,4 +1,4 @@
/* /*
* (C) Copyright 1997-2002 ELTEC Elektronik AG * (C) Copyright 1997-2002 ELTEC Elektronik AG
* Frank Gottschling <fgottschling@eltec.de> * Frank Gottschling <fgottschling@eltec.de>
* *