Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-09-17 09:19:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-09-17 09:30:34 +0300
commitb884188f8a6d6d043e48d617e9388ff27784ae9b (patch)
tree64706498f30bb4e79bff03a3ce006bc85aae680d /source/blender/imbuf/intern/iris.c
parenta72e60920400e157ca34a07f7b4d7df9849dbd23 (diff)
Cleanup: SGI format, avoid overflow
Harmless but causes warnings
Diffstat (limited to 'source/blender/imbuf/intern/iris.c')
-rw-r--r--source/blender/imbuf/intern/iris.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c
index 1810e75a006..385ed338a5f 100644
--- a/source/blender/imbuf/intern/iris.c
+++ b/source/blender/imbuf/intern/iris.c
@@ -142,8 +142,8 @@ static ushort getshort(MFileOffset *inf)
buf = MFILE_DATA(inf);
MFILE_STEP(inf, 2);
-
- return (buf[0] << 8) + (buf[1] << 0);
+
+ return ((ushort)buf[0] << 8) + ((ushort)buf[1] << 0);
}
static uint getlong(MFileOffset *mofs)
@@ -152,8 +152,8 @@ static uint getlong(MFileOffset *mofs)
buf = MFILE_DATA(mofs);
MFILE_STEP(mofs, 4);
-
- return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + (buf[3] << 0);
+
+ return ((uint)buf[0] << 24) + ((uint)buf[1] << 16) + ((uint)buf[2] << 8) + ((uint)buf[3] << 0);
}
static void putshort(FILE *outf, ushort val)