commit 0ff4ee8043a0714c8105e1d202b6563f64f61b11
author android-build-team Robot <android-build-team-robot@google.com> Tue May 09 08:35:35 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 09 08:35:35 2017 +0000
tree 8557d447a311d7f212218b9c52cf342b7d3ce08a
parent db570e5785b42bca84779865ae2064e51915f65e
parent 2cb858a7ed887b231086ae81e2b35a3614299da3

release-request-66ee9889-2756-44aa-9b4c-91e7b5c1058c-for-git_oc-dr1-release-3988462 snap-temp-L14700000061937187

Change-Id: Ib3380e25ab2b1c198e7662aa85510e7f679d3e95

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;
 		
 		}