diff options
author | 2023-09-06 16:33:35 +0000 | |
---|---|---|
committer | 2023-09-06 16:33:35 +0000 | |
commit | c01e3ba0358b8c9b442c76a6758e4a9b712ae32f (patch) | |
tree | 7fdcf845730314d2127755e0c7237c8ab0a9c72b /cmds/bootanimation/BootAnimation.cpp | |
parent | 713e3930c42a3b1a5bb7909ed0f59d498cdae227 (diff) | |
parent | 31eb3c89a94d77eae9503bd635a4f056db3e3a31 (diff) |
Merge "Migrate String8|16.setTo to assignment operator" into main
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
-rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 4690f3386616..fadf82afe858 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -1012,7 +1012,7 @@ static bool readFile(ZipFileRO* zip, const char* name, String8& outString) { return false; } - outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength()); + outString = String8((char const*)entryMap->getDataPtr(), entryMap->getDataLength()); delete entryMap; return true; } @@ -1306,7 +1306,7 @@ bool BootAnimation::preloadZip(Animation& animation) { part.audioData = (uint8_t *)map->getDataPtr(); part.audioLength = map->getDataLength(); } else if (leaf == "trim.txt") { - part.trimData.setTo((char const*)map->getDataPtr(), + part.trimData = String8((char const*)map->getDataPtr(), map->getDataLength()); } else { Animation::Frame frame; @@ -1396,7 +1396,7 @@ bool BootAnimation::movie() { if (!exts) { glGetError(); } else { - gl_extensions.setTo(exts); + gl_extensions = exts; if ((gl_extensions.find("GL_ARB_texture_non_power_of_two") != -1) || (gl_extensions.find("GL_OES_texture_npot") != -1)) { mUseNpotTextures = true; |