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

assume x and y are always zero in qt_rectconvert<DST, SRC>()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-04-01 21:08:48 +00:00
parent 98f067c949
commit d761982b51
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/image/qimage.cpp
View file

@ -2682,7 +2682,7 @@ static void convert_Mono_to_Indexed8(QImageData *dest, const QImageData *src, Qt
{ \
qt_rectconvert<DST, SRC>(reinterpret_cast<DST*>(dest->data), \
reinterpret_cast<const SRC*>(src->data), \
0, 0, src->width, src->height, \
src->width, src->height, \
dest->bytes_per_line, src->bytes_per_line); \
}

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

@ -1558,10 +1558,10 @@ inline void qt_memconvert(qrgb666 *dest, const quint32 *src, int count)
template <class DST, class SRC>
inline void qt_rectconvert(DST *dest, const SRC *src,
int x, int y, int width, int height,
int width, int height,
int dstStride, int srcStride)
{
char *d = (char*)(dest + x) + y * dstStride;
char *d = (char*)dest;
const char *s = (const char*)(src);
for (int i = 0; i < height; ++i) {
qt_memconvert<DST,SRC>((DST*)d, (const SRC*)s, width);
@ -1573,10 +1573,10 @@ inline void qt_rectconvert(DST *dest, const SRC *src,
#define QT_RECTCONVERT_TRIVIAL_IMPL(T) \
template <> \
inline void qt_rectconvert(T *dest, const T *src, \
int x, int y, int width, int height, \
int width, int height, \
int dstStride, int srcStride) \
{ \
char *d = (char*)(dest + x) + y * dstStride; \
char *d = (char*)dest; \
const char *s = (const char*)(src); \
for (int i = 0; i < height; ++i) { \
::memcpy(d, s, width * sizeof(T)); \