summaryrefslogtreecommitdiffstats
path: root/media/img_utils
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-07-25 18:05:46 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-07-25 18:06:57 -0700
commitca73159becc0fc0098530929e467a3d92e470571 (patch)
tree4174bc9dcdd6c2ee8b8dcab4fedcc65988b7ee0a /media/img_utils
parentc15c265676da2226a18a5373812608b19d4719d7 (diff)
downloadframeworks_av-ca73159becc0fc0098530929e467a3d92e470571.zip
frameworks_av-ca73159becc0fc0098530929e467a3d92e470571.tar.gz
frameworks_av-ca73159becc0fc0098530929e467a3d92e470571.tar.bz2
DNG: Clean up logging.
Change-Id: Ie34d5a22c89a726215d740fef359d53e5a1a360b
Diffstat (limited to 'media/img_utils')
-rw-r--r--media/img_utils/src/TiffEntry.cpp10
-rw-r--r--media/img_utils/src/TiffWriter.cpp8
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);