vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/video/readers/tga.c: Reorganize to separate RLE and

Browse source 
image processing, fix big-endian and support grayscale.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-09-27 21:49:08 +02:00
parent 4a87649207
commit 29648c5d84
2 changed files with 215 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/readers/tga.c: Reorganize to separate RLE and
image processing, fix big-endian and support grayscale.
2013-09-27 Vladimir Serbinenko <phcoder@gmail.com> 2013-09-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/fb/video_fb.c (grub_video_fb_create_render_target): * grub-core/video/fb/video_fb.c (grub_video_fb_create_render_target):

492
grub-core/video/readers/tga.c
View file

@ -77,196 +77,73 @@ struct grub_tga_header
grub_uint8_t image_descriptor; grub_uint8_t image_descriptor;
} __attribute__ ((packed)); } __attribute__ ((packed));
static grub_err_t struct tga_data
tga_load_truecolor_rle_R8G8B8 (struct grub_video_bitmap *bitmap,
struct grub_tga_header *header,
grub_file_t file)
{ {
unsigned int x; struct grub_tga_header hdr;
unsigned int y; int uses_rle;
grub_uint8_t type; int pktlen;
grub_uint8_t *ptr; int bpp;
grub_uint8_t tmp[4]; /* Size should be max_bpp / 8. */ int is_rle;
grub_uint8_t bytes_per_pixel; grub_uint8_t pixel[4];
struct grub_video_bitmap *bitmap;
grub_file_t file;
unsigned image_width;
unsigned image_height;
};
bytes_per_pixel = header->image_bpp / 8; static grub_err_t
fetch_pixel (struct tga_data *data)
for (y = 0; y < header->image_height; y++) {
if (!data->uses_rle)
{ {
ptr = bitmap->data; if (grub_file_read (data->file, &data->pixel[0], data->bpp)
if ((header->image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0) != data->bpp)
ptr += y * bitmap->mode_info.pitch; return grub_errno;
else return GRUB_ERR_NONE;
ptr += (header->image_height - 1 - y) * bitmap->mode_info.pitch;
for (x = 0; x < header->image_width;)
{
if (grub_file_read (file, &type, sizeof (type)) != sizeof(type))
return grub_errno;
if (type & 0x80)
{
/* RLE-encoded packet. */
type &= 0x7f;
type++;
if (grub_file_read (file, &tmp[0], bytes_per_pixel)
!= bytes_per_pixel)
return grub_errno;
while (type)
{
if (x < header->image_width)
{
ptr[0] = tmp[2];
ptr[1] = tmp[1];
ptr[2] = tmp[0];
ptr += 3;
}
type--;
x++;
}
}
else
{
/* RAW-encoded packet. */
type++;
while (type)
{
if (grub_file_read (file, &tmp[0], bytes_per_pixel)
!= bytes_per_pixel)
return grub_errno;
if (x < header->image_width)
{
ptr[0] = tmp[2];
ptr[1] = tmp[1];
ptr[2] = tmp[0];
ptr += 3;
}
type--;
x++;
}
}
}
} }
if (!data->pktlen)
{
grub_uint8_t type;
if (grub_file_read (data->file, &type, sizeof (type)) != sizeof(type))
return grub_errno;
data->is_rle = !!(type & 0x80);
data->pktlen = (type & 0x7f) + 1;
if (data->is_rle && grub_file_read (data->file, &data->pixel[0], data->bpp)
!= data->bpp)
return grub_errno;
}
if (!data->is_rle && grub_file_read (data->file, &data->pixel[0], data->bpp)
!= data->bpp)
return grub_errno;
data->pktlen--;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static grub_err_t static grub_err_t
tga_load_truecolor_rle_R8G8B8A8 (struct grub_video_bitmap *bitmap, tga_load_grayscale (struct tga_data *data)
struct grub_tga_header *header,
grub_file_t file)
{
unsigned int x;
unsigned int y;
grub_uint8_t type;
grub_uint8_t *ptr;
grub_uint8_t tmp[4]; /* Size should be max_bpp / 8. */
grub_uint8_t bytes_per_pixel;
bytes_per_pixel = header->image_bpp / 8;
for (y = 0; y < header->image_height; y++)
{
ptr = bitmap->data;
if ((header->image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0)
ptr += y * bitmap->mode_info.pitch;
else
ptr += (header->image_height - 1 - y) * bitmap->mode_info.pitch;
for (x = 0; x < header->image_width;)
{
if (grub_file_read (file, &type, sizeof (type)) != sizeof(type))
return grub_errno;
if (type & 0x80)
{
/* RLE-encoded packet. */
type &= 0x7f;
type++;
if (grub_file_read (file, &tmp[0], bytes_per_pixel)
!= bytes_per_pixel)
return grub_errno;
while (type)
{
if (x < header->image_width)
{
ptr[0] = tmp[2];
ptr[1] = tmp[1];
ptr[2] = tmp[0];
ptr[3] = tmp[3];
ptr += 4;
}
type--;
x++;
}
}
else
{
/* RAW-encoded packet. */
type++;
while (type)
{
if (grub_file_read (file, &tmp[0], bytes_per_pixel)
!= bytes_per_pixel)
return grub_errno;
if (x < header->image_width)
{
ptr[0] = tmp[2];
ptr[1] = tmp[1];
ptr[2] = tmp[0];
ptr[3] = tmp[3];
ptr += 4;
}
type--;
x++;
}
}
}
}
return GRUB_ERR_NONE;
}
static grub_err_t
tga_load_truecolor_R8G8B8 (struct grub_video_bitmap *bitmap,
struct grub_tga_header *header,
grub_file_t file)
{ {
unsigned int x; unsigned int x;
unsigned int y; unsigned int y;
grub_uint8_t *ptr; grub_uint8_t *ptr;
grub_uint8_t tmp[4]; /* Size should be max_bpp / 8. */
grub_uint8_t bytes_per_pixel;
bytes_per_pixel = header->image_bpp / 8; for (y = 0; y < data->image_height; y++)
for (y = 0; y < header->image_height; y++)
{ {
ptr = bitmap->data; ptr = data->bitmap->data;
if ((header->image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0) if ((data->hdr.image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0)
ptr += y * bitmap->mode_info.pitch; ptr += y * data->bitmap->mode_info.pitch;
else else
ptr += (header->image_height - 1 - y) * bitmap->mode_info.pitch; ptr += (data->image_height - 1 - y) * data->bitmap->mode_info.pitch;
for (x = 0; x < header->image_width; x++) for (x = 0; x < data->image_width; x++)
{ {
if (grub_file_read (file, &tmp[0], bytes_per_pixel) grub_err_t err;
!= bytes_per_pixel) err = fetch_pixel (data);
return grub_errno; if (err)
return err;
ptr[0] = tmp[2]; ptr[0] = data->pixel[0];
ptr[1] = tmp[1]; ptr[1] = data->pixel[0];
ptr[2] = tmp[0]; ptr[2] = data->pixel[0];
ptr += 3; ptr += 3;
} }
@ -275,36 +152,75 @@ tga_load_truecolor_R8G8B8 (struct grub_video_bitmap *bitmap,
} }
static grub_err_t static grub_err_t
tga_load_truecolor_R8G8B8A8 (struct grub_video_bitmap *bitmap, tga_load_truecolor_R8G8B8 (struct tga_data *data)
struct grub_tga_header *header,
grub_file_t file)
{ {
unsigned int x; unsigned int x;
unsigned int y; unsigned int y;
grub_uint8_t *ptr; grub_uint8_t *ptr;
grub_uint8_t tmp[4]; /* Size should be max_bpp / 8. */
grub_uint8_t bytes_per_pixel;
bytes_per_pixel = header->image_bpp / 8; for (y = 0; y < data->image_height; y++)
for (y = 0; y < header->image_height; y++)
{ {
ptr = bitmap->data; ptr = data->bitmap->data;
if ((header->image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0) if ((data->hdr.image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0)
ptr += y * bitmap->mode_info.pitch; ptr += y * data->bitmap->mode_info.pitch;
else else
ptr += (header->image_height - 1 - y) * bitmap->mode_info.pitch; ptr += (data->image_height - 1 - y) * data->bitmap->mode_info.pitch;
for (x = 0; x < header->image_width; x++) for (x = 0; x < data->image_width; x++)
{ {
if (grub_file_read (file, &tmp[0], bytes_per_pixel) grub_err_t err;
!= bytes_per_pixel) err = fetch_pixel (data);
return grub_errno; if (err)
return err;
ptr[0] = tmp[2]; #ifdef GRUB_CPU_WORDS_BIGENDIAN
ptr[1] = tmp[1]; ptr[0] = data->pixel[0];
ptr[2] = tmp[0]; ptr[1] = data->pixel[1];
ptr[3] = tmp[3]; ptr[2] = data->pixel[2];
#else
ptr[0] = data->pixel[2];
ptr[1] = data->pixel[1];
ptr[2] = data->pixel[0];
#endif
ptr += 3;
}
}
return GRUB_ERR_NONE;
}
static grub_err_t
tga_load_truecolor_R8G8B8A8 (struct tga_data *data)
{
unsigned int x;
unsigned int y;
grub_uint8_t *ptr;
for (y = 0; y < data->image_height; y++)
{
ptr = data->bitmap->data;
if ((data->hdr.image_descriptor & GRUB_TGA_IMAGE_ORIGIN_TOP) != 0)
ptr += y * data->bitmap->mode_info.pitch;
else
ptr += (data->image_height - 1 - y) * data->bitmap->mode_info.pitch;
for (x = 0; x < data->image_width; x++)
{
grub_err_t err;
err = fetch_pixel (data);
if (err)
return err;
#ifdef GRUB_CPU_WORDS_BIGENDIAN
ptr[0] = data->pixel[0];
ptr[1] = data->pixel[1];
ptr[2] = data->pixel[2];
ptr[3] = data->pixel[3];
#else
ptr[0] = data->pixel[2];
ptr[1] = data->pixel[1];
ptr[2] = data->pixel[0];
ptr[3] = data->pixel[3];
#endif
ptr += 4; ptr += 4;
} }
@ -316,13 +232,13 @@ static grub_err_t
grub_video_reader_tga (struct grub_video_bitmap **bitmap, grub_video_reader_tga (struct grub_video_bitmap **bitmap,
const char *filename) const char *filename)
{ {
grub_file_t file;
grub_ssize_t pos; grub_ssize_t pos;
struct grub_tga_header header; struct tga_data data;
int has_alpha;
file = grub_buffile_open (filename, 0); grub_memset (&data, 0, sizeof (data));
if (! file)
data.file = grub_buffile_open (filename, 0);
if (! data.file)
return grub_errno; return grub_errno;
/* TGA Specification states that we SHOULD start by reading /* TGA Specification states that we SHOULD start by reading
@ -330,114 +246,126 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
not going to support developer area & extensions at this point. */ not going to support developer area & extensions at this point. */
/* Read TGA header from beginning of file. */ /* Read TGA header from beginning of file. */
if (grub_file_read (file, &header, sizeof (header)) if (grub_file_read (data.file, &data.hdr, sizeof (data.hdr))
!= sizeof (header)) != sizeof (data.hdr))
{ {
grub_file_close (file); grub_file_close (data.file);
return grub_errno; return grub_errno;
} }
/* Skip ID field. */ /* Skip ID field. */
pos = grub_file_tell (file); pos = grub_file_tell (data.file);
pos += header.id_length; pos += data.hdr.id_length;
grub_file_seek (file, pos); grub_file_seek (data.file, pos);
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
{ {
grub_file_close (file); grub_file_close (data.file);
return grub_errno; return grub_errno;
} }
grub_dprintf("tga", "tga: header\n"); grub_dprintf("tga", "tga: header\n");
dump_int_field(header.id_length); dump_int_field(data.hdr.id_length);
dump_int_field(header.color_map_type); dump_int_field(data.hdr.color_map_type);
dump_int_field(header.image_type); dump_int_field(data.hdr.image_type);
dump_int_field(header.color_map_first_index); dump_int_field(data.hdr.color_map_first_index);
dump_int_field(header.color_map_length); dump_int_field(data.hdr.color_map_length);
dump_int_field(header.color_map_bpp); dump_int_field(data.hdr.color_map_bpp);
dump_int_field(header.image_x_origin); dump_int_field(data.hdr.image_x_origin);
dump_int_field(header.image_y_origin); dump_int_field(data.hdr.image_y_origin);
dump_int_field(header.image_width); dump_int_field(data.hdr.image_width);
dump_int_field(header.image_height); dump_int_field(data.hdr.image_height);
dump_int_field(header.image_bpp); dump_int_field(data.hdr.image_bpp);
dump_int_field(header.image_descriptor); dump_int_field(data.hdr.image_descriptor);
data.image_width = grub_le_to_cpu16 (data.hdr.image_width);
data.image_height = grub_le_to_cpu16 (data.hdr.image_height);
/* Check that bitmap encoding is supported. */ /* Check that bitmap encoding is supported. */
switch (header.image_type) switch (data.hdr.image_type)
{ {
case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_TRUECOLOR: case GRUB_TGA_IMAGE_TYPE_RLE_TRUECOLOR:
case GRUB_TGA_IMAGE_TYPE_RLE_TRUECOLOR: case GRUB_TGA_IMAGE_TYPE_RLE_BLACK_AND_WHITE:
break; data.uses_rle = 1;
break;
case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_TRUECOLOR:
case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_BLACK_AND_WHITE:
data.uses_rle = 0;
break;
default: default:
grub_file_close (file); grub_file_close (data.file);
return grub_error (GRUB_ERR_BAD_FILE_TYPE, return grub_error (GRUB_ERR_BAD_FILE_TYPE,
"unsupported bitmap format (unknown encoding)"); "unsupported bitmap format (unknown encoding %d)", data.hdr.image_type);
} }
data.bpp = data.hdr.image_bpp / 8;
/* Check that bitmap depth is supported. */ /* Check that bitmap depth is supported. */
switch (header.image_bpp) switch (data.hdr.image_type)
{ {
case 24: case GRUB_TGA_IMAGE_TYPE_RLE_BLACK_AND_WHITE:
has_alpha = 0; case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_BLACK_AND_WHITE:
break; if (data.hdr.image_bpp != 8)
{
case 32: grub_file_close (data.file);
has_alpha = 1; return grub_error (GRUB_ERR_BAD_FILE_TYPE,
break; "unsupported bitmap format (bpp=%d)",
data.hdr.image_bpp);
default: }
grub_file_close (file); grub_video_bitmap_create (bitmap, data.image_width,
return grub_error (GRUB_ERR_BAD_FILE_TYPE, data.image_height,
"unsupported bitmap format (bpp=%d)", GRUB_VIDEO_BLIT_FORMAT_RGB_888);
header.image_bpp);
}
/* Allocate bitmap. If there is alpha information store it too. */
if (has_alpha)
{
grub_video_bitmap_create (bitmap, header.image_width,
header.image_height,
GRUB_VIDEO_BLIT_FORMAT_RGBA_8888);
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
{ {
grub_file_close (file); grub_file_close (data.file);
return grub_errno; return grub_errno;
} }
data.bitmap = *bitmap;
/* Load bitmap data. */ /* Load bitmap data. */
switch (header.image_type) tga_load_grayscale (&data);
{ break;
case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_TRUECOLOR:
tga_load_truecolor_R8G8B8A8 (*bitmap, &header, file);
break;
case GRUB_TGA_IMAGE_TYPE_RLE_TRUECOLOR: case GRUB_TGA_IMAGE_TYPE_RLE_TRUECOLOR:
tga_load_truecolor_rle_R8G8B8A8 (*bitmap, &header, file); case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_TRUECOLOR:
break; switch (data.hdr.image_bpp)
} {
} case 24:
else grub_video_bitmap_create (bitmap, data.image_width,
{ data.image_height,
grub_video_bitmap_create (bitmap, header.image_width, GRUB_VIDEO_BLIT_FORMAT_RGB_888);
header.image_height, if (grub_errno != GRUB_ERR_NONE)
GRUB_VIDEO_BLIT_FORMAT_RGB_888); {
if (grub_errno != GRUB_ERR_NONE) grub_file_close (data.file);
{ return grub_errno;
grub_file_close (file); }
return grub_errno;
}
/* Load bitmap data. */ data.bitmap = *bitmap;
switch (header.image_type) /* Load bitmap data. */
{ tga_load_truecolor_R8G8B8 (&data);
case GRUB_TGA_IMAGE_TYPE_UNCOMPRESSED_TRUECOLOR: break;
tga_load_truecolor_R8G8B8 (*bitmap, &header, file);
break;
case GRUB_TGA_IMAGE_TYPE_RLE_TRUECOLOR: case 32:
tga_load_truecolor_rle_R8G8B8 (*bitmap, &header, file); grub_video_bitmap_create (bitmap, data.image_width,
break; data.image_height,
} GRUB_VIDEO_BLIT_FORMAT_RGBA_8888);
if (grub_errno != GRUB_ERR_NONE)
{
grub_file_close (data.file);
return grub_errno;
}
data.bitmap = *bitmap;
/* Load bitmap data. */
tga_load_truecolor_R8G8B8A8 (&data);
break;
default:
grub_file_close (data.file);
return grub_error (GRUB_ERR_BAD_FILE_TYPE,
"unsupported bitmap format (bpp=%d)",
data.hdr.image_bpp);
}
} }
/* If there was a loading problem, destroy bitmap. */ /* If there was a loading problem, destroy bitmap. */
@ -447,13 +375,13 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
*bitmap = 0; *bitmap = 0;
} }
grub_file_close (file); grub_file_close (data.file);
return grub_errno; return grub_errno;
} }
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
static grub_err_t static grub_err_t
grub_cmd_tgatest (grub_command_t cmd __attribute__ ((unused)), grub_cmd_tgatest (grub_command_t cmd_d __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
struct grub_video_bitmap *bitmap = 0; struct grub_video_bitmap *bitmap = 0;