From 835d49d1534405075d75068635894ead17af56b8 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 18 Jul 2018 19:28:59 +0000
Subject: Add pdfium::span::as_bytes() and as_writable_bytes().

Picks up some enhancements from base/span.h.  In turn, also adds
the size_bytes() helper.  Differs from base version in that it
works around C++14 enable_if_t<>, and avoids the dynamic_extent
template specialization tricks.

Use it in a few places where appropriate.

Change-Id: I86f72cf0023f2d4317a7afa351fddee601c8f86c
Reviewed-on: https://pdfium-review.googlesource.com/38251
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
---
 core/fpdfapi/parser/fpdf_parser_decode.cpp | 5 ++---
 core/fxcrt/bytestring_unittest.cpp         | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 82d84ab705..9ccca121ad 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -500,9 +500,8 @@ ByteString PDF_EncodeText(const wchar_t* pString, int len) {
   size_t dest_index = 0;
   size_t encLen = len * 2 + 2;
   {
-    pdfium::span<char> cspan = result.GetBuffer(encLen);
-    auto dest_buf = pdfium::make_span(reinterpret_cast<uint8_t*>(cspan.data()),
-                                      cspan.size());
+    pdfium::span<uint8_t> dest_buf =
+        pdfium::as_writable_bytes(result.GetBuffer(encLen));
     dest_buf[dest_index++] = 0xfe;
     dest_buf[dest_index++] = 0xff;
     for (int j = 0; j < len; ++j) {
diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp
index fb5fc0d996..7095a1b799 100644
--- a/core/fxcrt/bytestring_unittest.cpp
+++ b/core/fxcrt/bytestring_unittest.cpp
@@ -1060,8 +1060,7 @@ TEST(ByteStringView, NotNull) {
   ByteStringView string3("abc");
   ByteStringView string6("abcdef");
   ByteStringView alternate_string3("abcdef", 3);
-  ByteStringView span_string4(
-      pdfium::span<const uint8_t>(reinterpret_cast<const uint8_t*>("abcd"), 4));
+  ByteStringView span_string4(pdfium::as_bytes(pdfium::make_span("abcd", 4)));
   ByteStringView embedded_nul_string7("abc\0def", 7);
   ByteStringView illegal_string7("abcdef", 7);
 
@@ -1355,8 +1354,8 @@ TEST(ByteStringView, OperatorEQ) {
   EXPECT_FALSE(c_string2 == byte_string_c);
   EXPECT_FALSE(c_string3 == byte_string_c);
 
-  pdfium::span<const uint8_t> span5(reinterpret_cast<const uint8_t*>("hello"),
-                                    5);
+  pdfium::span<const uint8_t> span5(
+      pdfium::as_bytes(pdfium::make_span("hello", 5)));
   EXPECT_EQ(byte_string_c.span(), span5);
 }
 
-- 
cgit v1.2.3