Skip to content

Commit 6a4e8df

Browse files
Merge remote-tracking branch 'remotes/origin/hotfix_jpeg_loader' into mitsuba_xml_2_material_frontend
2 parents 1b0b6f3 + 5def0b4 commit 6a4e8df

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/nbl/asset/interchange/CImageLoaderJPG.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,11 @@ bool CImageLoaderJPG::isALoadableFileFormat(system::IFile* _file, const system::
157157
if (!_file)
158158
return false;
159159

160-
uint32_t header = 0;
160+
uint16_t soiMarker = 0;
161161
system::IFile::success_t success;
162-
_file->read(success, &header, 6, sizeof(uint32_t));
163-
return success && ((header&0x00FFD8FFu)==0x00FFD8FFu || header == 0x4a464946 || header == 0x4649464a || header == 0x66697845u || header == 0x70747468u); // maybe 0x4a464946 can go
162+
_file->read(success, &soiMarker, 0, sizeof(uint16_t));
163+
constexpr auto JPEG_VALID_SOI_MARKER = 0xD8FF;
164+
return success && (soiMarker == JPEG_VALID_SOI_MARKER);
164165
#endif
165166
}
166167

0 commit comments

Comments
 (0)