drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GIFMovie: Stop using internal Skia APIs

Browse Source 
Bug: 178700363
Test: manual

Instead of using sk_memset32, which is private to Skia, use regular
memset. Skia recently moved sk_memset32, resulting in a build breakage.
But it's not obvious that this deprecated class needs the faster version
of memset.

Also remove an include of SkTemplates, which is no longer used.

Change-Id: Iae6b495e5aace3ea92d2fc59798ea3fd23d3b1b9
This commit is contained in:
Leon Scroggins III 2021-11-01 10:47:28 -04:00
parent c27e4cdfa3
commit c6fe3efe6c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/jni/GIFMovie.cpp
View File

@ -10,13 +10,13 @@
#include "SkColor.h"
#include "SkColorPriv.h"
#include "SkStream.h"
#include "SkTemplates.h"
#include "SkUtils.h"
#include "gif_lib.h"
#include <log/log.h>
#include <string.h>
#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
#define DGifCloseFile(a, b) DGifCloseFile(a)
#endif
@ -219,8 +219,9 @@ static void fillRect(SkBitmap* bm, GifWord left, GifWord top, GifWord width, Gif
copyHeight = bmHeight - top;
}
size_t bytes = copyWidth * SkColorTypeBytesPerPixel(bm->colorType());
for (; copyHeight > 0; copyHeight--) {
sk_memset32(dst, col, copyWidth);
memset(dst, col, bytes);
dst += bmWidth;
}
}