2 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp
index 344dfcddd9..18af171677 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/xfa_ffimageedit.cpp
@@ -140,7 +140,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags,
       pFileRead->ReadBlock(pImageBuffer, 0, nDataSize);
       bsBuf.ReleaseBuffer();
       if (!bsBuf.IsEmpty()) {
-        FX_CHAR* pData = XFA_Base64Encode(bsBuf, nDataSize);
+        FX_CHAR* pData = XFA_Base64Encode(bsBuf.raw_str(), nDataSize);
         wsImage = CFX_WideString::FromLocal(pData);
         FX_Free(pData);
       }
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 0192c8b46c..ebe04f15c2 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -997,7 +997,7 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc,
     } else {
       bsContent = CFX_ByteString::FromUnicode(wsImage);
       pImageFileRead = FX_CreateMemoryStream(
-          (uint8_t*)(const uint8_t*)bsContent, bsContent.GetLength());
+          const_cast<uint8_t*>(bsContent.raw_str()), bsContent.GetLength());
     }
   } else {
     CFX_WideString wsURL = wsHref;