[Bf-blender-cvs] [b884188f8a6] master: Cleanup: SGI format, avoid overflow

Campbell Barton noreply at git.blender.org
Sun Sep 17 08:20:06 CEST 2017


Commit: b884188f8a6d6d043e48d617e9388ff27784ae9b
Author: Campbell Barton
Date:   Sun Sep 17 16:19:07 2017 +1000
Branches: master
https://developer.blender.org/rBb884188f8a6d6d043e48d617e9388ff27784ae9b

Cleanup: SGI format, avoid overflow

Harmless but causes warnings

===================================================================

M	source/blender/imbuf/intern/iris.c

===================================================================

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)



More information about the Bf-blender-cvs mailing list