projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040619-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
pcx.c
diff --git
a/src/libgame/pcx.c
b/src/libgame/pcx.c
index c7b308b0900a4d56644f73823e7248c173131fb3..5fdf6f3ecb56d7a53e3272c8b6d88e7df2a604fa 100644
(file)
--- a/
src/libgame/pcx.c
+++ b/
src/libgame/pcx.c
@@
-167,12
+167,11
@@
static boolean PCX_ReadBitmap(FILE *file, struct PCX_Header *pcx, Image *image)
for (j = 7; j >= 0; j--)
{
for (j = 7; j >= 0; j--)
{
- byte bit;
+ byte bit
= (value >> j) & 1
;
if (i * 8 + j >= width) /* skip padding bits */
continue;
if (i * 8 + j >= width) /* skip padding bits */
continue;
- bit = (value >> j) & 1;
bitmap_ptr[x++] |= bit << plane;
}
}
bitmap_ptr[x++] |= bit << plane;
}
}
@@
-221,7
+220,7
@@
static byte *PCX_ReadColormap(Image *image,byte *buffer_ptr, byte *buffer_last)
return NULL;
/* read 256 colors from PCX colormap */
return NULL;
/* read 256 colors from PCX colormap */
- for (i
=0; i<
PCX_MAXCOLORS; i++)
+ for (i
= 0; i <
PCX_MAXCOLORS; i++)
{
image->rgb.red[i] = *buffer_ptr++ << 8;
image->rgb.green[i] = *buffer_ptr++ << 8;
{
image->rgb.red[i] = *buffer_ptr++ << 8;
image->rgb.green[i] = *buffer_ptr++ << 8;
@@
-257,7
+256,7
@@
static boolean PCX_ReadColormap(FILE *file,struct PCX_Header *pcx,Image *image)
while (value != PCX_256COLORS_MAGIC);
/* read 256 colors from PCX colormap */
while (value != PCX_256COLORS_MAGIC);
/* read 256 colors from PCX colormap */
- for(i = 0; i < PCX_MAXCOLORS; i++)
+ for
(i = 0; i < PCX_MAXCOLORS; i++)
{
image->rgb.red[i] = (byte)fgetc(file) << 8;
image->rgb.green[i] = (byte)fgetc(file) << 8;
{
image->rgb.red[i] = (byte)fgetc(file) << 8;
image->rgb.green[i] = (byte)fgetc(file) << 8;
@@
-266,7
+265,7
@@
static boolean PCX_ReadColormap(FILE *file,struct PCX_Header *pcx,Image *image)
}
else
{
}
else
{
- for(i = 0; i < num_colors; i++)
+ for
(i = 0; i < num_colors; i++)
{
image->rgb.red[i] = pcx->palette[i][0] << 8;
image->rgb.green[i] = pcx->palette[i][1] << 8;
{
image->rgb.red[i] = pcx->palette[i][0] << 8;
image->rgb.green[i] = pcx->palette[i][1] << 8;
@@
-376,7
+375,7
@@
Image *Read_PCX_to_Image(char *filename)
if (pcx_depth == 8)
{
/* determine number of used colormap entries for 8-bit PCX images */
if (pcx_depth == 8)
{
/* determine number of used colormap entries for 8-bit PCX images */
- for (i
=0; i<
PCX_MAXCOLORS; i++)
+ for (i
= 0; i <
PCX_MAXCOLORS; i++)
if (image->rgb.color_used[i])
image->rgb.used++;
}
if (image->rgb.color_used[i])
image->rgb.used++;
}