diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2018-11-20 12:57:14 -0800 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2018-11-21 10:44:33 -0800 |
commit | 7ea165eee5d01e4cd8b99ebc2aae20d802615f5a (patch) | |
tree | 655481cedac1beadca6fc13d6d1e702f17a703d1 | |
parent | 09f199a694ef5b956cabc368e40ab5ca11c64044 (diff) | |
download | dynamic_depth-7ea165eee5d01e4cd8b99ebc2aae20d802615f5a.tar.gz |
Sync libdynamic_depth to CL #222429857
- Fix signed/unsigned char implicit conversion to
fix x86 build.
- Namespacing adjustments
Test: lunch aosp_x86-eng && m libdynamic_depth
Change-Id: I2c464f2df03e3b821ec04387e9a5b0c8bbb930ec
-rw-r--r-- | METADATA | 4 | ||||
-rw-r--r-- | internal/strings/escaping.cc | 6 | ||||
-rw-r--r-- | internal/strings/escaping.h | 6 | ||||
-rw-r--r-- | internal/xmpmeta/base64.cc | 7 | ||||
-rw-r--r-- | internal/xmpmeta/jpeg_io.cc | 2 | ||||
-rw-r--r-- | internal/xmpmeta/md5.cc | 4 |
6 files changed, 8 insertions, 21 deletions
@@ -7,11 +7,11 @@ third_party { type: PIPER value: "http://google3/photos/editing/formats/dynamic_depth" } - version: "221702153" + version: "222429857" last_upgrade_date { year: 2018 month: 11 - day: 15 + day: 21 } license_type: NOTICE } diff --git a/internal/strings/escaping.cc b/internal/strings/escaping.cc index de8e297..7386e4a 100644 --- a/internal/strings/escaping.cc +++ b/internal/strings/escaping.cc @@ -6,7 +6,6 @@ #include "strings/ascii_ctype.h" namespace dynamic_depth { -namespace absl { // ---------------------------------------------------------------------- // ptrdiff_t Base64Unescape() - base64 decoder @@ -411,10 +410,6 @@ bool WebSafeBase64Unescape(const string& src, string* dest) { return Base64UnescapeInternal(src.data(), src.size(), dest, kUnWebSafeBase64); } -} // namespace absl - -namespace strings { - // Base64Escape // // NOTE: We have to use an unsigned type for src because code built @@ -588,5 +583,4 @@ string b2a_hex(const char* b, ptrdiff_t len) { return result; } -} // namespace strings } // namespace dynamic_depth diff --git a/internal/strings/escaping.h b/internal/strings/escaping.h index b0316b1..d03eb0f 100644 --- a/internal/strings/escaping.h +++ b/internal/strings/escaping.h @@ -19,7 +19,6 @@ #include "base/port.h" namespace dynamic_depth { -namespace absl { // ---------------------------------------------------------------------- // Base64Unescape() @@ -42,10 +41,6 @@ bool Base64Unescape(const string& src, string* dest); // ---------------------------------------------------------------------- bool WebSafeBase64Unescape(const string& src, string* dest); -} // namespace absl - -namespace strings { - // ---------------------------------------------------------------------- // Base64Escape() // Encode "src" to "dest" using base64 encoding. @@ -66,7 +61,6 @@ void Base64Escape(const unsigned char* src, ptrdiff_t szsrc, string* dest, // ---------------------------------------------------------------------- string b2a_hex(const char* from, ptrdiff_t num); -} // namespace strings } // namespace dynamic_depth #endif // DYNAMIC_DEPTH_INTERNAL_STRINGS_ESCAPING_H_ // NOLINT diff --git a/internal/xmpmeta/base64.cc b/internal/xmpmeta/base64.cc index a21d8b5..3bdf5d7 100644 --- a/internal/xmpmeta/base64.cc +++ b/internal/xmpmeta/base64.cc @@ -8,8 +8,7 @@ namespace { bool EncodeBase64RawData(const uint8* data, size_t data_size, string* output) { // Disable linting because string_view doesn't appear to support uint8_t. - dynamic_depth::strings::Base64Escape(data, data_size, output, - false); // NOLINT + dynamic_depth::Base64Escape(data, data_size, output, false); // NOLINT return output->length() > 0; } @@ -41,10 +40,10 @@ bool DecodeBase64(const string& data, string* output) { // Support decoding of both web-safe and regular base64. // "Web-safe" base-64 replaces + with - and / with _, and omits // trailing = padding characters. - if (dynamic_depth::absl::Base64Unescape(data, output)) { + if (dynamic_depth::Base64Unescape(data, output)) { return true; } - return dynamic_depth::absl::WebSafeBase64Unescape(data, output); + return dynamic_depth::WebSafeBase64Unescape(data, output); } // Base64-encodes the given data. diff --git a/internal/xmpmeta/jpeg_io.cc b/internal/xmpmeta/jpeg_io.cc index 20fc7a6..5464cb8 100644 --- a/internal/xmpmeta/jpeg_io.cc +++ b/internal/xmpmeta/jpeg_io.cc @@ -175,7 +175,7 @@ std::vector<Section> Parse(const ParseOptions& options, void WriteSections(const std::vector<Section>& sections, std::ostream* output_stream) { output_stream->put(0xff); - output_stream->put(kSoi); + output_stream->put(static_cast<unsigned char>(kSoi)); for (const Section& section : sections) { output_stream->put(0xff); output_stream->put(section.marker); diff --git a/internal/xmpmeta/md5.cc b/internal/xmpmeta/md5.cc index 1349483..008ff7a 100644 --- a/internal/xmpmeta/md5.cc +++ b/internal/xmpmeta/md5.cc @@ -216,8 +216,8 @@ string MD5Hash(const string& to_hash) { buffer.resize(kMd5DigestSize); MD5(reinterpret_cast<const uint8_t*>(to_hash.data()), to_hash.length(), &buffer[0]); - return dynamic_depth::strings::b2a_hex( - reinterpret_cast<const char*>(&buffer[0]), kMd5DigestSize); + return dynamic_depth::b2a_hex(reinterpret_cast<const char*>(&buffer[0]), + kMd5DigestSize); } } // namespace photos_editing_formats |