Add support for CR3s with embedded heif thumbnails am: 5c5b671ef7 am: 81b491ff16 am: 8060966efd am: 3b60c65baa

Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1726814

Change-Id: Ibf04ad4e11ab521ea8dc8302d084b8544e612280

1 files changed, 14 insertions, 14 deletions

diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc
index f36c5ba..fc63461 100644
--- a/src/tiff_parser.cc
+++ b/src/tiff_parser.cc
@@ -54,20 +54,6 @@ bool GetFullDimension16(const TiffDirectory& tiff_directory,
   return true;
 }
 
-bool GetRational(const TiffDirectory::Tag& tag, const TiffDirectory& directory,
-                 const int data_size, PreviewImageData::Rational* data) {
-  std::vector<Rational> value;
-  if (directory.Get(tag, &value) &&
-      value.size() == static_cast<size_t>(data_size)) {
-    for (size_t i = 0; i < value.size(); ++i) {
-      data[i].numerator = value[i].numerator;
-      data[i].denominator = value[i].denominator;
-    }
-    return true;
-  }
-  return false;
-}
-
 void FillGpsPreviewImageData(const TiffDirectory& gps_directory,
                              PreviewImageData* preview_image_data) {
   if (gps_directory.Has(kGpsTagLatitudeRef) &&
@@ -463,6 +449,20 @@ bool GetJpegDimensions(const std::uint32_t jpeg_offset, StreamInterface* stream,
   return false;
 }
 
+bool GetRational(const TiffDirectory::Tag& tag, const TiffDirectory& directory,
+                 const int data_size, PreviewImageData::Rational* data) {
+  std::vector<Rational> value;
+  if (directory.Get(tag, &value) &&
+      value.size() == static_cast<size_t>(data_size)) {
+    for (size_t i = 0; i < value.size(); ++i) {
+      data[i].numerator = value[i].numerator;
+      data[i].denominator = value[i].denominator;
+    }
+    return true;
+  }
+  return false;
+}
+
 bool IsThumbnail(const Image& image, const int max_dimension) {
   return image.width <= max_dimension && image.height <= max_dimension;
 }