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

* grub-core/video/readers/png.c (grub_png_convert_image): Use

Browse source 
unsigned arithmetics.
	Add missing break.
This commit is contained in:
Vladimir Serbinenko 2013-10-25 20:36:39 +02:00
parent 74ff2c0501
commit f690f8b030
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/readers/png.c (grub_png_convert_image): Use
unsigned arithmetics.
Add missing break.
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/readers/jpeg.c: Use unsigned where appropriate. * grub-core/video/readers/jpeg.c: Use unsigned where appropriate.

12
grub-core/video/readers/png.c
View file

@ -97,7 +97,8 @@ struct grub_png_data
grub_uint32_t next_offset; grub_uint32_t next_offset;
int image_width, image_height, bpp, is_16bit; unsigned image_width, image_height;
int bpp, is_16bit;
int raw_bytes, is_gray, is_alpha, is_palette; int raw_bytes, is_gray, is_alpha, is_palette;
int row_bytes, color_bits; int row_bytes, color_bits;
grub_uint8_t *image_data; grub_uint8_t *image_data;
@ -818,7 +819,7 @@ static const grub_uint8_t png_magic[8] =
static void static void
grub_png_convert_image (struct grub_png_data *data) grub_png_convert_image (struct grub_png_data *data)
{ {
int i; unsigned i;
grub_uint8_t *d1, *d2; grub_uint8_t *d1, *d2;
d1 = (*data->bitmap)->data; d1 = (*data->bitmap)->data;
@ -848,11 +849,11 @@ grub_png_convert_image (struct grub_png_data *data)
grub_uint8_t *d1c, *d2c; grub_uint8_t *d1c, *d2c;
int shift; int shift;
int mask = (1 << data->color_bits) - 1; int mask = (1 << data->color_bits) - 1;
int j; unsigned j;
if (data->is_gray) if (data->is_gray)
for (i = 0; i < (1 << data->color_bits); i++) for (i = 0; i < (1U << data->color_bits); i++)
{ {
grub_uint8_t col = (0xff * i) / ((1 << data->color_bits) - 1); grub_uint8_t col = (0xff * i) / ((1U << data->color_bits) - 1);
palette[i][0] = col; palette[i][0] = col;
palette[i][1] = col; palette[i][1] = col;
palette[i][2] = col; palette[i][2] = col;
@ -910,6 +911,7 @@ grub_png_convert_image (struct grub_png_data *data)
d1[B4] = d2[3]; d1[B4] = d2[3];
d1[A4] = d2[1]; d1[A4] = d2[1];
} }
break;
case 2: case 2:
if (data->is_16bit) if (data->is_16bit)
/* 16-bit gray without alpha. */ /* 16-bit gray without alpha. */