Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 11:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move misc drawing helper functions to the top of qdrawhelper source

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-03-20 23:49:11 +00:00
parent 3881bce10c
commit 6dc38d71f7
2 changed files with 865 additions and 879 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1714
src/gui/painting/qdrawhelper.cpp
View file

File diff suppressed because it is too large Load diff

30
src/gui/painting/qdrawhelper_p.h
View file

@ -1556,20 +1556,6 @@ inline void qt_memconvert(qrgb666 *dest, const quint32 *src, int count)
} }
#endif // Q_BYTE_ORDER #endif // Q_BYTE_ORDER
template <class T>
inline void qt_rectcopy(T *dest, const T *src,
int x, int y, int width, int height,
int dstStride, int srcStride)
{
char *d = (char*)(dest + x) + y * dstStride;
const char *s = (const char*)(src);
for (int i = 0; i < height; ++i) {
::memcpy(d, s, width * sizeof(T));
d += dstStride;
s += srcStride;
}
}
template <class DST, class SRC> template <class DST, class SRC>
inline void qt_rectconvert(DST *dest, const SRC *src, inline void qt_rectconvert(DST *dest, const SRC *src,
int x, int y, int width, int height, int x, int y, int width, int height,
@ -1590,7 +1576,13 @@ inline void qt_rectconvert(DST *dest, const SRC *src,
int x, int y, int width, int height, \ int x, int y, int width, int height, \
int dstStride, int srcStride) \ int dstStride, int srcStride) \
{ \ { \
qt_rectcopy(dest, src, x, y, width, height, dstStride, srcStride); \ char *d = (char*)(dest + x) + y * dstStride; \
const char *s = (const char*)(src); \
for (int i = 0; i < height; ++i) { \
::memcpy(d, s, width * sizeof(T)); \
d += dstStride; \
s += srcStride; \
} \
} }
QT_RECTCONVERT_TRIVIAL_IMPL(quint32) QT_RECTCONVERT_TRIVIAL_IMPL(quint32)
@ -1608,14 +1600,6 @@ QT_RECTCONVERT_TRIVIAL_IMPL(qrgb444)
static inline int qt_div_255(int x) { return (x + (x>>8) + 0x80) >> 8; } static inline int qt_div_255(int x) { return (x + (x>>8) + 0x80) >> 8; }
static inline QRgb qConvertRgb16To32(uint c)
{
return 0xff000000
| ((((c) << 3) & 0xf8) | (((c) >> 2) & 0x7))
| ((((c) << 5) & 0xfc00) | (((c) >> 1) & 0x300))
| ((((c) << 8) & 0xf80000) | (((c) << 3) & 0x70000));
}
static const uint qt_bayer_matrix[16][16] = { static const uint qt_bayer_matrix[16][16] = {
{ 0x1, 0xc0, 0x30, 0xf0, 0xc, 0xcc, 0x3c, 0xfc, { 0x1, 0xc0, 0x30, 0xf0, 0xc, 0xcc, 0x3c, 0xfc,
0x3, 0xc3, 0x33, 0xf3, 0xf, 0xcf, 0x3f, 0xff}, 0x3, 0xc3, 0x33, 0xf3, 0xf, 0xcf, 0x3f, 0xff},