commit bbdf0b8778230f6dc94b8a19c4bac98d66354948
author android-build-team Robot <android-build-team-robot@google.com> Tue May 16 07:30:05 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 16 07:30:05 2017 +0000
tree 8557d447a311d7f212218b9c52cf342b7d3ce08a
parent db570e5785b42bca84779865ae2064e51915f65e
parent 50bce460f7b0f0a14c78881be5c1fdf7d1c8dbc2

release-request-ad2b7abc-f489-4c21-891e-cb2cf48c6370-for-git_oc-release-4012004 snap-temp-L44000000064332402

Change-Id: Icea36f374c9ad2889c4cf08ddb49e10984d55601

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