qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't assuming 32 bpp in setup_pixrow_span

Browse source
This commit is contained in:
Bill Currie 2003-03-21 22:18:20 +00:00
parent 91bebf1bfa
commit bd08b03791
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libs/util/tga.c
View file

@ -207,16 +207,17 @@ reverse_read_l (byte *buf, int count, byte **data, cmap_t *cmap)
} }
static inline void static inline void
setup_pixrow_span (TargaHeader *targa, tex_t *tex, byte **_pixrow, int *_span) setup_pixrow_span (TargaHeader *targa, tex_t *tex, byte **_pixrow, int *_span,
int pixbytes)
{ {
byte *pixrow; byte *pixrow;
int span; int span;
span = targa->width * 4; span = targa->width * pixbytes;
pixrow = tex->data; pixrow = tex->data;
if (targa->attributes & 0x10) { if (targa->attributes & 0x10) {
// right to left // right to left
pixrow += span - 4; pixrow += span - pixbytes;
} }
if (!(targa->attributes & 0x20)) { if (!(targa->attributes & 0x20)) {
// bottom to top // bottom to top
@ -331,7 +332,7 @@ decode_colormap (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) { if (targa->attributes & 0x10) {
// right to left // right to left
@ -361,7 +362,7 @@ decode_truecolor_24 (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) { if (targa->attributes & 0x10) {
// right to left // right to left
@ -391,7 +392,7 @@ decode_truecolor_32 (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) { if (targa->attributes & 0x10) {
// right to left // right to left
@ -463,7 +464,7 @@ decode_colormap_rle (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) // right to left if (targa->attributes & 0x10) // right to left
rle_expand (reverse_read_cmap); rle_expand (reverse_read_cmap);
@ -481,7 +482,7 @@ decode_truecolor_24_rle (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) // right to left if (targa->attributes & 0x10) // right to left
rle_expand (reverse_read_bgr); rle_expand (reverse_read_bgr);
@ -499,7 +500,7 @@ decode_truecolor_32_rle (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 4);
if (targa->attributes & 0x10) // right to left if (targa->attributes & 0x10) // right to left
rle_expand (reverse_read_bgra); rle_expand (reverse_read_bgra);
@ -560,7 +561,7 @@ decode_greyscale (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 1);
if (targa->attributes & 0x10) { if (targa->attributes & 0x10) {
// right to left // right to left
@ -597,7 +598,7 @@ decode_greyscale_rle (TargaHeader *targa, tex_t *tex, byte *dataByte)
columns = targa->width; columns = targa->width;
rows = targa->height; rows = targa->height;
setup_pixrow_span (targa, tex, &pixrow, &span); setup_pixrow_span (targa, tex, &pixrow, &span, 1);
if (targa->attributes & 0x10) // right to left if (targa->attributes & 0x10) // right to left
rle_expand (reverse_read_l); rle_expand (reverse_read_l);