diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 23:44:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:44:49 +0000 |
| commit | 43486e80d5643f9324784a69a5f45a0923ceb711 (patch) | |
| tree | bab4840bfb8daa95ddf537bc91d08462d4bcbd1b /media | |
| parent | 04c6cdbbf4719a7922d3ced85dc165690c0fd4c9 (diff) | |
| parent | 08fa30dcc5427daefb34e0bfa781da31f85b9e58 (diff) | |
| download | frameworks_av-43486e80d5643f9324784a69a5f45a0923ceb711.zip frameworks_av-43486e80d5643f9324784a69a5f45a0923ceb711.tar.gz frameworks_av-43486e80d5643f9324784a69a5f45a0923ceb711.tar.bz2 | |
am 08fa30dc: am 5abc1201: am 3cc93734: Merge "Fix build with clang"
* commit '08fa30dcc5427daefb34e0bfa781da31f85b9e58':
Fix build with clang
Diffstat (limited to 'media')
| -rw-r--r-- | media/img_utils/src/TiffWriter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/img_utils/src/TiffWriter.cpp b/media/img_utils/src/TiffWriter.cpp index ac41734..a6f9218 100644 --- a/media/img_utils/src/TiffWriter.cpp +++ b/media/img_utils/src/TiffWriter.cpp @@ -106,7 +106,6 @@ status_t TiffWriter::write(Output* out, StripSource** sources, size_t sourcesCou for (size_t i = 0; i < offVecSize; ++i) { uint32_t ifdKey = offsetVector.keyAt(i); - uint32_t nextOffset = offsetVector[i]; uint32_t sizeToWrite = mNamedIfds[ifdKey]->getStripSize(); bool found = false; for (size_t j = 0; j < sourcesCount; ++j) { @@ -124,7 +123,7 @@ status_t TiffWriter::write(Output* out, StripSource** sources, size_t sourcesCou ALOGE("%s: No stream for byte strips for IFD %u", __FUNCTION__, ifdKey); return BAD_VALUE; } - assert(nextOffset == endOut.getCurrentOffset()); + assert(offsetVector[i] == endOut.getCurrentOffset()); } return ret; |