Make explicit CFX_ByteString conversions to uint8_t*

core/fxcrt/include/fx_string.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXCRT_INCLUDE_FX_STRING_H_
 #define CORE_FXCRT_INCLUDE_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
@@ skipping 162 matching lines @@
   // Implicit conversion to C-style string -- deprecated.
   operator const FX_CHAR*() const { return m_pData ? m_pData->m_String : ""; }
 
   // Explicit conversion to uint8_t*.
   // Note: |this| must outlive the use of the result.
   const uint8_t* raw_str() const {
     return m_pData ? reinterpret_cast<const uint8_t*>(m_pData->m_String)
                    : nullptr;
   }
 
-  // Implicit conversion to uint8_t* -- deprecated.
-  operator const uint8_t*() const {
-    return m_pData ? reinterpret_cast<const uint8_t*>(m_pData->m_String)
-                   : nullptr;
-  }
-
   // Explicit conversion to CFX_ByteStringC.
   // Note: |this| must outlive the use of the result.
   CFX_ByteStringC AsStringC() const {
     return CFX_ByteStringC(raw_str(), GetLength());
   }
 
   FX_STRSIZE GetLength() const { return m_pData ? m_pData->m_nDataLength : 0; }
   bool IsEmpty() const { return !GetLength(); }
 
   int Compare(const CFX_ByteStringC& str) const;
@@ skipping 88 matching lines @@
                  FX_STRSIZE nCopyLen,
                  FX_STRSIZE nCopyIndex) const;
   void AssignCopy(const FX_CHAR* pSrcData, FX_STRSIZE nSrcLen);
   void Concat(const FX_CHAR* lpszSrcData, FX_STRSIZE nSrcLen);
 
   CFX_RetainPtr<StringData> m_pData;
   friend class fxcrt_ByteStringConcat_Test;
 };
 
 inline CFX_ByteStringC& CFX_ByteStringC::operator=(const CFX_ByteString& src) {
-  m_Ptr = (const uint8_t*)src;
+  m_Ptr = src.raw_str();
   m_Length = src.GetLength();
   return *this;
 }
 
 inline bool operator==(const char* lhs, const CFX_ByteString& rhs) {
   return rhs == lhs;
 }
 inline bool operator==(const CFX_ByteStringC& lhs, const CFX_ByteString& rhs) {
   return rhs == lhs;
 }
@@ skipping 379 matching lines @@
 }
 
 FX_FLOAT FX_atof(const CFX_ByteStringC& str);
 inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) {
   return FX_atof(FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength()).c_str());
 }
 void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
 
 #endif  // CORE_FXCRT_INCLUDE_FX_STRING_H_