Merge remote-tracking branch 'origin/1.x'
This commit is contained in:
commit
9d968fa3ac
1 changed files with 1 additions and 1 deletions
|
@ -426,7 +426,7 @@ void TestNotificationListener::testNotify()
|
||||||
0x31, 0x32, 0x33, 0x34 };
|
0x31, 0x32, 0x33, 0x34 };
|
||||||
QVariantMap imageData = {{"width", width}, {"height", height}, {"rowStride", rowStride},
|
QVariantMap imageData = {{"width", width}, {"height", height}, {"rowStride", rowStride},
|
||||||
{"bitsPerSample", bitsPerSample}, {"channels", channels},
|
{"bitsPerSample", bitsPerSample}, {"channels", channels},
|
||||||
{"hasAlpha", hasAlpha}, {"imageData", rawData}};
|
{"hasAlpha", hasAlpha}, {"imageData", QByteArray(rawData, sizeof(rawData))}};
|
||||||
QVariantMap hints;
|
QVariantMap hints;
|
||||||
#define COMPARE_PIXEL(x, y) \
|
#define COMPARE_PIXEL(x, y) \
|
||||||
QCOMPARE(qRed(image.pixel(x,y)), (int)rawData[x*4 + y*rowStride + 0]); \
|
QCOMPARE(qRed(image.pixel(x,y)), (int)rawData[x*4 + y*rowStride + 0]); \
|
||||||
|
|
Loading…
Reference in a new issue