AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QT_MEMFILL_xxx macros

Browse Source 
They were just calling a function, may as well just call said function
directly.

Change-Id: I343f2beed55440a7ac0bfffd15636b183c1a420f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Thiago Macieira 2018-11-02 14:14:09 -07:00
parent 3e36fb641e
commit b514c82e1d
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qdrawhelper.cpp
View File

@ -4343,7 +4343,7 @@ static void blend_color_argb(int count, const QSpan *spans, void *userData)
while (count--) {
uint *target = ((uint *)data->rasterBuffer->scanLine(spans->y)) + spans->x;
if (spans->coverage == 255) {
QT_MEMFILL_UINT(target, spans->len, color);
qt_memfill(target, color, spans->len);
} else {
uint c = BYTE_MUL(color, spans->coverage);
int ialpha = 255 - spans->coverage;
@ -4422,7 +4422,7 @@ static void blend_color_rgb16(int count, const QSpan *spans, void *userData)
while (count--) {
ushort *target = ((ushort *)data->rasterBuffer->scanLine(spans->y)) + spans->x;
if (spans->coverage == 255) {
QT_MEMFILL_USHORT(target, spans->len, c);
qt_memfill(target, c, spans->len);
} else {
ushort color = BYTE_MUL_RGB16(c, spans->coverage);
int ialpha = 255 - spans->coverage;

2
src/gui/painting/qdrawhelper_neon.cpp
View File

@ -791,7 +791,7 @@ void QT_FASTCALL qt_destStoreRGB16_neon(QRasterBuffer *rasterBuffer, int x, int
void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha)
{
if ((const_alpha & qAlpha(color)) == 255) {
QT_MEMFILL_UINT(destPixels, length, color);
qt_memfill32(destPixels, color, length);
} else {
if (const_alpha != 255)
color = BYTE_MUL(color, const_alpha);

6
src/gui/painting/qdrawhelper_p.h
View File

@ -944,12 +944,6 @@ inline void qt_rectfill(T *dest, T value,
}
}
#define QT_MEMFILL_UINT(dest, length, color) \
qt_memfill<quint32>(dest, color, length);
#define QT_MEMFILL_USHORT(dest, length, color) \
qt_memfill<quint16>(dest, color, length);
#define QT_MEMCPY_REV_UINT(dest, src, length) \
do { \
/* Duff's device */ \