abdelrahman/tiffread
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NULL header, ifd and image definitions

Browse Source
This commit is contained in:
Abdelrahman Said
2024-05-05 23:33:53 +01:00
parent 11798a0683
commit cd424bf074
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tiff/tiffread.c
View File

@@ -18,17 +18,7 @@
#define IS_TIFF_EXTENSION(EXT) \ #define IS_TIFF_EXTENSION(EXT) \
(strncmp(EXT, ".tif", 4) == 0 || strncmp(EXT, ".tiff", 5) == 0) (strncmp(EXT, ".tif", 4) == 0 || strncmp(EXT, ".tiff", 5) == 0)
#define NULL_TIFF_HEADER ((TiffHdr){0})
#define IS_NULL_HEADER(HDR) (HDR.order == 0)
#define NULL_TIFF_IFD ((TiffIFD){0})
#define IS_NULL_IFD(IFD) (IFD.count == 0)
#define NULL_TIFF_IMAGE ((TiffImage){0})
#define IS_NULL_IMAGE(IMG) (IMG.type == TIFF_IMAGE_TYPE_INVALID)
#define NULL_TIFF_ALPHA ((TiffAlpha){0}) #define NULL_TIFF_ALPHA ((TiffAlpha){0})
#define IS_NULL_ALPHA(ALPHA) (ALPHA.type == ALPHA_TYPE_UNDEFINED)
#define INVALID_SAMPLE_COUNT 0 #define INVALID_SAMPLE_COUNT 0
#define INVALID_ROWS_PER_STRIP 0 #define INVALID_ROWS_PER_STRIP 0
@@ -134,7 +124,6 @@ READ_BASELINE_RETURN_IMG:
} }
internal bool read_tiff_header(TiffReader *reader) { internal bool read_tiff_header(TiffReader *reader) {
reader->header = NULL_TIFF_HEADER;
fread_with_offset(reader->fp, &(reader->header), sizeof(TiffHdr), 0); fread_with_offset(reader->fp, &(reader->header), sizeof(TiffHdr), 0);
switch (reader->header.order) { switch (reader->header.order) {
@@ -164,7 +153,6 @@ internal bool read_tiff_header(TiffReader *reader) {
} }
internal bool read_ifd(TiffReader *reader, Arena *arena) { internal bool read_ifd(TiffReader *reader, Arena *arena) {
reader->ifd = NULL_TIFF_IFD;
fread_with_offset(reader->fp, &(reader->ifd.count), sizeof(reader->ifd.count), fread_with_offset(reader->fp, &(reader->ifd.count), sizeof(reader->ifd.count),
reader->header.first_ifd_offset); reader->header.first_ifd_offset);
@@ -197,7 +185,6 @@ internal bool read_ifd(TiffReader *reader, Arena *arena) {
} }
internal bool read_ifd_fields(TiffReader *reader) { internal bool read_ifd_fields(TiffReader *reader) {
reader->img = NULL_TIFF_IMAGE;
reader->img.type = TIFF_IMAGE_TYPE_BILEVEL; reader->img.type = TIFF_IMAGE_TYPE_BILEVEL;
for (u64 i = 0; i < reader->ifd.count; ++i) { for (u64 i = 0; i < reader->ifd.count; ++i) {