Skip to content

Commit 2a4dd61

Browse files
committed
Use tinyusd_int64 for portability.
Cast to int64 explicitly.
1 parent 92908b6 commit 2a4dd61

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tinyexr.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,10 +5026,10 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header,
50265026
return TINYEXR_ERROR_INVALID_DATA;
50275027
}
50285028

5029-
int64_t data_width =
5030-
exr_header->data_window.max_x - exr_header->data_window.min_x + 1;
5031-
int64_t data_height =
5032-
exr_header->data_window.max_y - exr_header->data_window.min_y + 1;
5029+
tinyexr_int64 data_width =
5030+
static_cast<tinyexr_int64>(exr_header->data_window.max_x) - static_cast<tinyexr_int64>(exr_header->data_window.min_x) + static_cast<tinyexr_int64>(1);
5031+
tinyexr_int64 data_height =
5032+
static_cast<tinyexr_int64>(exr_header->data_window.max_y) - static_cast<tinyexr_int64>(exr_header->data_window.min_y) + static_cast<tinyexr_int64>(1);
50335033

50345034
if (data_width <= 0) {
50355035
if (err) {
@@ -5768,8 +5768,8 @@ static int DecodeEXRImage(EXRImage *exr_image, const EXRHeader *exr_header,
57685768
tinyexr::SetErrorMessage("Invalid data width value", err);
57695769
return TINYEXR_ERROR_INVALID_DATA;
57705770
}
5771-
int64_t data_width =
5772-
exr_header->data_window.max_x - exr_header->data_window.min_x + 1;
5771+
tinyexr_int64 data_width =
5772+
static_cast<tinyexr_int64>(exr_header->data_window.max_x) - static_cast<tinyexr_int64>(exr_header->data_window.min_x) + static_cast<tinyexr_int64>(1);
57735773
if (data_width <= 0) {
57745774
tinyexr::SetErrorMessage("Invalid data window width value", err);
57755775
return TINYEXR_ERROR_INVALID_DATA;
@@ -5781,8 +5781,8 @@ static int DecodeEXRImage(EXRImage *exr_image, const EXRHeader *exr_header,
57815781
tinyexr::SetErrorMessage("Invalid data height value", err);
57825782
return TINYEXR_ERROR_INVALID_DATA;
57835783
}
5784-
int64_t data_height =
5785-
exr_header->data_window.max_y - exr_header->data_window.min_y + 1;
5784+
tinyexr_int64 data_height =
5785+
static_cast<tinyexr_int64>(exr_header->data_window.max_y) - static_cast<tinyexr_int64>(exr_header->data_window.min_y) + static_cast<tinyexr_int64>(1);
57865786

57875787
if (data_height <= 0) {
57885788
tinyexr::SetErrorMessage("Invalid data window height value", err);

0 commit comments

Comments
 (0)