Merge "DNG: Clean up logging." into lmp-dev (d8f33e78) · Commits · e / os / android_frameworks_av

media/img_utils/src/TiffEntry.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -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;

+3 −5

Original line number	Diff line number	Diff line
		@@ -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();
		}

		if (LOG_NDEBUG == 0) {
		log();
		}

		for (size_t i = 0; i < offVecSize; ++i) {
		uint32_t ifdKey = offsetVector.keyAt(i);