aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYujie Qin <yujieqin@google.com>2016-01-25 13:12:07 +0100
committerYujie Qin <yujieqin@google.com>2016-01-25 13:12:07 +0100
commitafc6ebdcba72e4eeeaafab1547c19025fcec5d1f (patch)
tree55b58163de54c308a1ce6ba89e7c984b32bf4fb2
parent3eaa83178e9d1722c126d598d3eee7fb383c2c85 (diff)
downloadpiex-afc6ebdcba72e4eeeaafab1547c19025fcec5d1f.tar.gz
Sync to github.com/google/piex at commit 0bce6433c1bc4c45fe9b2237d4c3596fc3f8e087
-rw-r--r--src/tiff_directory/tiff_directory.cc2
-rw-r--r--src/tiff_parser.cc2
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<std::uint32_t>(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;