blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: use define for targa header size

This commit is contained in:
Campbell Barton 2020-11-11 15:05:30 +11:00
parent 75c18b989c
commit 11bf3b7035
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/imbuf/intern/targa.c
View File

@ -60,6 +60,14 @@ typedef struct TARGA {
unsigned char imgdes;
} TARGA;
/**
* On-disk header size.
*
* \note In theory it's possible padding would make the struct and on-disk size differ,
* so use a constant instead of `sizeof(TARGA)`.
*/
#define TARGA_HEADER_SIZE 18
/***/
static int tga_out1(unsigned int data, FILE *file)
@ -286,14 +294,12 @@ static bool dumptarga(struct ImBuf *ibuf, FILE *file)
return 1;
}
int imb_savetarga(struct ImBuf *ibuf, const char *filepath, int flags)
int imb_savetarga(struct ImBuf *ibuf, const char *filepath, int UNUSED(flags))
{
char buf[18] = {0};
char buf[TARGA_HEADER_SIZE] = {0};
FILE *fildes;
bool ok = false;
(void)flags; /* unused */
buf[16] = (ibuf->planes + 0x7) & ~0x7;
if (ibuf->planes > 8) {
buf[2] = 10;
@ -326,7 +332,7 @@ int imb_savetarga(struct ImBuf *ibuf, const char *filepath, int flags)
return 0;
}
if (fwrite(buf, 1, 18, fildes) != 18) {
if (fwrite(buf, 1, TARGA_HEADER_SIZE, fildes) != TARGA_HEADER_SIZE) {
fclose(fildes);
return 0;
}
@ -647,7 +653,7 @@ ImBuf *imb_loadtarga(const unsigned char *mem,
if (tga.imgtyp < 4) {
ibuf->foptions.flag |= RAWTGA;
}
mem = mem + 18 + tga.numid;
mem = mem + TARGA_HEADER_SIZE + tga.numid;
cp[0] = 0xff;
cp[1] = cp[2] = 0;