From f172290a8dc527cd8bc73b0d0ad59e78797968c1 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 12:13:50 -0700 Subject: Remove CFX_ByteString::Load() and operator= for CFX_ByteTextBuf The few places these are called are better served by explicit calls to CFX_ByteString() itself. This helps make Byte and Wide strings more similar. Also prevents fx_string.h from having any knowledge of fx_basic.h's ByteTextBuf class. Review URL: https://codereview.chromium.org/1870043003 --- core/fxcodec/codec/fx_codec_png.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxcodec/codec/fx_codec_png.cpp') diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp index fd56c93393..29ea794b5d 100644 --- a/core/fxcodec/codec/fx_codec_png.cpp +++ b/core/fxcodec/codec/fx_codec_png.cpp @@ -82,9 +82,9 @@ static void _png_load_bmp_attribute(png_structp png_ptr, } else { buf = "Author"; if (!FXSYS_memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) { - pAttribute->m_strAuthor.Empty(); - pAttribute->m_strAuthor.Load((uint8_t*)text[i].text, - (FX_STRSIZE)text[i].text_length); + pAttribute->m_strAuthor = + CFX_ByteString(reinterpret_cast(text[i].text), + static_cast(text[i].text_length)); } } } -- cgit v1.2.3