From afc6ebdcba72e4eeeaafab1547c19025fcec5d1f Mon Sep 17 00:00:00 2001 From: Yujie Qin Date: Mon, 25 Jan 2016 13:12:07 +0100 Subject: [PATCH] Sync to github.com/google/piex at commit 0bce6433c1bc4c45fe9b2237d4c3596fc3f8e087 --- src/tiff_directory/tiff_directory.cc | 2 +- src/tiff_parser.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tiff_directory/tiff_directory.cc b/src/tiff_directory/tiff_directory.cc index c0f2c49..8db15a2 100644 --- a/src/tiff_directory/tiff_directory.cc +++ b/src/tiff_directory/tiff_directory.cc @@ -219,7 +219,7 @@ bool TiffDirectory::GetOffsetAndLength(const Tag tag, const Type type, return false; } *offset = directory_entry->offset; - *length = directory_entry->value.size(); + *length = static_cast(directory_entry->value.size()); return true; } diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc index cad5bc4..4143b16 100644 --- a/src/tiff_parser.cc +++ b/src/tiff_parser.cc @@ -133,7 +133,7 @@ void FillGpsPreviewImageData(const TiffDirectory& gps_directory, return; } - constexpr size_t kGpsDateStampSize = 11; + const size_t kGpsDateStampSize = 11; if (!gps_directory.Get(kGpsTagDateStamp, &preview_image_data->gps.date_stamp)) { return;