diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-07-26 01:18:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-25 21:16:23 +0000 |
| commit | d8f33e78f9a09ffda0d7c9cadc1902044849461c (patch) | |
| tree | d1266b0a9f11c517b5cf9b8e01dfe47b43e3b208 | |
| parent | ec3c71ed320e5e2252a84aa8b35ac4b9a6f92712 (diff) | |
| parent | ca73159becc0fc0098530929e467a3d92e470571 (diff) | |
| download | frameworks_av-d8f33e78f9a09ffda0d7c9cadc1902044849461c.zip frameworks_av-d8f33e78f9a09ffda0d7c9cadc1902044849461c.tar.gz frameworks_av-d8f33e78f9a09ffda0d7c9cadc1902044849461c.tar.bz2 | |
Merge "DNG: Clean up logging." into lmp-dev
| -rw-r--r-- | media/img_utils/src/TiffEntry.cpp | 10 | ||||
| -rw-r--r-- | media/img_utils/src/TiffWriter.cpp | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/media/img_utils/src/TiffEntry.cpp b/media/img_utils/src/TiffEntry.cpp index 9cea721..1b20e36 100644 --- a/media/img_utils/src/TiffEntry.cpp +++ b/media/img_utils/src/TiffEntry.cpp @@ -203,14 +203,20 @@ String8 TiffEntry::toString() const { } break; } - case FLOAT: - case DOUBLE: { + case FLOAT: { const float* typed_data = getData<float>(); for (size_t i = 0; i < cappedCount; ++i) { output.appendFormat("%f ", typed_data[i]); } break; } + case DOUBLE: { + const double* typed_data = getData<double>(); + for (size_t i = 0; i < cappedCount; ++i) { + output.appendFormat("%f ", typed_data[i]); + } + break; + } default: { output.append("unknown type "); break; diff --git a/media/img_utils/src/TiffWriter.cpp b/media/img_utils/src/TiffWriter.cpp index d85289e..ac41734 100644 --- a/media/img_utils/src/TiffWriter.cpp +++ b/media/img_utils/src/TiffWriter.cpp @@ -66,10 +66,6 @@ status_t TiffWriter::write(Output* out, StripSource** sources, size_t sourcesCou return BAD_VALUE; } - if (LOG_NDEBUG == 0) { - log(); - } - uint32_t totalSize = getTotalSize(); KeyedVector<uint32_t, uint32_t> offsetVector; @@ -104,7 +100,9 @@ status_t TiffWriter::write(Output* out, StripSource** sources, size_t sourcesCou ifd = ifd->getNextIfd(); } - log(); + if (LOG_NDEBUG == 0) { + log(); + } for (size_t i = 0; i < offVecSize; ++i) { uint32_t ifdKey = offsetVector.keyAt(i); |