Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use unsigned int to store TIFF IFD offsets #3923

Merged
merged 3 commits into from Jun 29, 2019
Merged

Use unsigned int to store TIFF IFD offsets #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ebde32
Use unsigned int to store TIFF IFD offsets
cgohlke Jun 27, 2019
129df60
Use unsigned int to store TIFF IFD offsets
cgohlke Jun 27, 2019
59e1328
Use unsigned int to store TIFF IFD offsets
cgohlke Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/decode.c
View file
Open in desktop
Expand Up @@ -503,9 +503,9 @@ PyImaging_LibTiffDecoderNew(PyObject* self, PyObject* args)
char* rawmode;
char* compname;
int fp;
int ifdoffset;
uint32 ifdoffset;

if (! PyArg_ParseTuple(args, "sssii", &mode, &rawmode, &compname, &fp, &ifdoffset))
if (! PyArg_ParseTuple(args, "sssiI", &mode, &rawmode, &compname, &fp, &ifdoffset))
return NULL;

TRACE(("new tiff decoder %s\n", compname));
Expand Down
2 changes: 1 addition & 1 deletion src/libImaging/TiffDecode.c
View file
Open in desktop
Expand Up @@ -147,7 +147,7 @@ void _tiffUnmapProc(thandle_t hdata, tdata_t base, toff_t size) {
(void) hdata; (void) base; (void) size;
}

int ImagingLibTiffInit(ImagingCodecState state, int fp, int offset) {
int ImagingLibTiffInit(ImagingCodecState state, int fp, uint32 offset) {
TIFFSTATE *clientstate = (TIFFSTATE *)state->context;

TRACE(("initing libtiff\n"));
Expand Down
2 changes: 1 addition & 1 deletion src/libImaging/TiffDecode.h
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ typedef struct {



extern int ImagingLibTiffInit(ImagingCodecState state, int fp, int offset);
extern int ImagingLibTiffInit(ImagingCodecState state, int fp, uint32 offset);
extern int ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp);
extern int ImagingLibTiffMergeFieldInfo(ImagingCodecState state, TIFFDataType field_type, int key);
extern int ImagingLibTiffSetField(ImagingCodecState state, ttag_t tag, ...);
Expand Down