diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-25 17:52:06 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-25 17:52:06 +0000 |
| commit | bb389f4c326f45d74532cc38e659d9a453869c2f (patch) | |
| tree | d49fb775bdf32dcb66fe70a228c476446d4fbe31 | |
| parent | 0420a20d94d620f471e47cf3f8c40facca5de58e (diff) | |
| parent | a17ec13a0180786cfe0b0e90c5aa671f6157bbbe (diff) | |
| download | platform_external_dng_sdk-nougat-mr1.5-release.tar.gz platform_external_dng_sdk-nougat-mr1.5-release.tar.bz2 platform_external_dng_sdk-nougat-mr1.5-release.zip | |
Merge cherrypicks of [2315763, 2315554, 2315573, 2315765, 2315712, 2315595, 2315713, 2315746, 2315786, 2315799, 2315576, 2315800, 2315673, 2315821, 2315578, 2315597, 2315633, 2315598, 2315769, 2315716, 2315634, 2315823, 2315801, 2315636, 2315717, 2315772, 2315753, 2315803, 2315638, 2315840, 2315841, 2315842, 2315824, 2315791, 2315879, 2315804, 2315827, 2315863, 2315792, 2315864, 2315755, 2315882, 2315756, 2315828, 2315793, 2315865, 2315883, 2315899, 2315885, 2315796, 2315869, 2315923, 2315924, 2315943] into nyc-mr1-security-e-releaseandroid-7.1.1_r57android-7.1.1_r55android-7.1.1_r52android-7.1.1_r48android-7.1.1_r45nougat-mr1.7-releasenougat-mr1.5-release
Change-Id: I6131fbe82cdf5e9cc5acf9708f6b7135f8489427
| -rw-r--r-- | source/dng_ifd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ uint32 dng_ifd::TilesAcross () const if (fTileWidth) { - return (fImageWidth + fTileWidth - 1) / fTileWidth; + return (SafeUint32Sub(SafeUint32Add(fImageWidth, fTileWidth), 1)) / fTileWidth; } @@ -3995,7 +3995,7 @@ uint32 dng_ifd::TilesDown () const if (fTileLength) { - return (fImageLength + fTileLength - 1) / fTileLength; + return (SafeUint32Sub(SafeUint32Add(fImageLength, fTileLength), 1)) / fTileLength; } |