Snap for 4620899 from 0aa61f9e866945145bf3dc21c1255190dedb78ef to pi-release
Change-Id: I4a2907f8873b85be7db0de52caa1fa74a5af52b3
diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc
index 24368e0..6bf3bb4 100644
--- a/src/tiff_parser.cc
+++ b/src/tiff_parser.cc
@@ -596,23 +596,41 @@
bool GetFullCropDimension(const tiff_directory::TiffDirectory& tiff_directory,
std::uint32_t* width, std::uint32_t* height) {
- if (tiff_directory.Has(kExifTagDefaultCropSize)) {
- std::vector<std::uint32_t> crop(2);
- std::vector<Rational> crop_rational(2);
- if (tiff_directory.Get(kExifTagDefaultCropSize, &crop)) {
+ if (!tiff_directory.Has(kExifTagDefaultCropSize)) {
+ // This doesn't look right to return true here, as we have not written
+ // anything to *width and *height. However, changing the return value here
+ // causes a whole bunch of tests to fail.
+ // TODO(timurrrr): Return false and fix the tests.
+ // In fact, this whole if() seems to be not needed,
+ // as tiff_directory(kExifTagDefaultCropSize) will return false below.
+ return true;
+ }
+
+ std::vector<std::uint32_t> crop(2);
+ if (tiff_directory.Get(kExifTagDefaultCropSize, &crop)) {
+ if (crop.size() == 2 && crop[0] > 0 && crop[1] > 0) {
*width = crop[0];
*height = crop[1];
- } else if (tiff_directory.Get(kExifTagDefaultCropSize, &crop_rational) &&
- crop_rational[0].denominator != 0 &&
- crop_rational[1].denominator != 0) {
- *width = crop_rational[0].numerator / crop_rational[0].denominator;
- *height = crop_rational[1].numerator / crop_rational[1].denominator;
+ return true;
} else {
return false;
}
}
- return true;
+ std::vector<Rational> crop_rational(2);
+ if (tiff_directory.Get(kExifTagDefaultCropSize, &crop_rational)) {
+ if (crop_rational.size() == 2 && crop_rational[0].numerator > 0 &&
+ crop_rational[0].denominator > 0 && crop_rational[1].numerator > 0 &&
+ crop_rational[1].denominator > 0) {
+ *width = crop_rational[0].numerator / crop_rational[0].denominator;
+ *height = crop_rational[1].numerator / crop_rational[1].denominator;
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ return false;
}
TiffParser::TiffParser(StreamInterface* stream) : stream_(stream) {}