commit fe333e3d65102a16ae84a819ff567d425ff50397
author android-build-team Robot <android-build-team-robot@google.com> Wed May 17 08:10:24 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 17 08:10:24 2017 +0000
tree 8557d447a311d7f212218b9c52cf342b7d3ce08a
parent db570e5785b42bca84779865ae2064e51915f65e
parent 6608c7b00715ce4a68e0c2aa336bc90a3c59e262

release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release-4017105 snap-temp-L82600000064873863

Change-Id: Ife7f917897e0eb590a8ebf468c77a533b19888e6

source/dng_ifd.cpp

diff --git a/source/dng_ifd.cpp b/source/dng_ifd.cpp
index 317ebf9..7f22065 100644
--- a/source/dng_ifd.cpp
+++ b/source/dng_ifd.cpp
@@ -3979,7 +3979,7 @@
 	if (fTileWidth)
 		{
 
-		return (fImageWidth + fTileWidth - 1) / fTileWidth;
+		return (SafeUint32Sub(SafeUint32Add(fImageWidth, fTileWidth), 1)) / fTileWidth;
 		
 		}
 		
@@ -3995,7 +3995,7 @@
 	if (fTileLength)
 		{
 
-		return (fImageLength + fTileLength - 1) / fTileLength;
+		return (SafeUint32Sub(SafeUint32Add(fImageLength, fTileLength), 1)) / fTileLength;
 		
 		}