griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: incorrect iris image header detection

Browse Source 
The first two bytes were being checked in the wrong order,
if files using this header were loaded they would detect as IRIS files
from imb_is_a_iris which would then fail to load (printing errors).
This commit is contained in:
Campbell Barton
2025-04-09 11:05:47 +10:00
parent e94068e8d2
commit 35f5877ac3
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/imbuf/intern/format_iris.cc
View File

@@ -202,15 +202,12 @@ static void readtab(MFileOffset *inf, uint *tab, int len)
/* From misc_util: flip the bytes from x. */
#define GS(x) (((uchar *)(x))[0] << 8 | ((uchar *)(x))[1])
/* This one is only def-ed once, strangely... */
#define GSS(x) (((uchar *)(x))[1] << 8 | ((uchar *)(x))[0])
bool imb_is_a_iris(const uchar *mem, size_t size)
{
if (size < 2) {
return false;
}
return ((GS(mem) == IMAGIC) || (GSS(mem) == IMAGIC));
return GS(mem) == IMAGIC;
}
ImBuf *imb_loadiris(const uchar *mem, size_t size, int flags, ImFileColorSpace & /*r_colorspace*/)
@@ -236,10 +233,8 @@ ImBuf *imb_loadiris(const uchar *mem, size_t size, int flags, ImFileColorSpace &
}
readheader(inf, &image);
if (image.imagic != IMAGIC) {
fprintf(stderr, "longimagedata: bad magic number in image file\n");
return nullptr;
}
/* The call to `imb_is_a_iris` ensures this. */
BLI_assert(image.imagic == IMAGIC);
rle = ISRLE(image.type);
bpp = BPP(image.type);