mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-31 16:27:03 +08:00
fix(draw_sw): fix swapped 90/270 rotation in case of RGB888 (#6642)
This commit is contained in:
committed by
GitHub
parent
c98fb29dea
commit
1c4d84e07d
@@ -615,8 +615,8 @@ static void rotate90_argb8888(const uint32_t * src, uint32_t * dst, int32_t srcW
|
|||||||
|
|
||||||
#if LV_DRAW_SW_SUPPORT_RGB888
|
#if LV_DRAW_SW_SUPPORT_RGB888
|
||||||
|
|
||||||
static void rotate270_rgb888(const uint8_t * src, uint8_t * dst, int32_t srcWidth, int32_t srcHeight, int32_t srcStride,
|
static void rotate90_rgb888(const uint8_t * src, uint8_t * dst, int32_t srcWidth, int32_t srcHeight, int32_t srcStride,
|
||||||
int32_t dstStride)
|
int32_t dstStride)
|
||||||
{
|
{
|
||||||
if(LV_RESULT_OK == LV_DRAW_SW_ROTATE90_RGB888(src, dst, srcWidth, srcHeight, srcStride, dstStride)) {
|
if(LV_RESULT_OK == LV_DRAW_SW_ROTATE90_RGB888(src, dst, srcWidth, srcHeight, srcStride, dstStride)) {
|
||||||
return ;
|
return ;
|
||||||
@@ -651,8 +651,8 @@ static void rotate180_rgb888(const uint8_t * src, uint8_t * dst, int32_t width,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rotate90_rgb888(const uint8_t * src, uint8_t * dst, int32_t width, int32_t height, int32_t srcStride,
|
static void rotate270_rgb888(const uint8_t * src, uint8_t * dst, int32_t width, int32_t height, int32_t srcStride,
|
||||||
int32_t dstStride)
|
int32_t dstStride)
|
||||||
{
|
{
|
||||||
if(LV_RESULT_OK == LV_DRAW_SW_ROTATE270_RGB888(src, dst, srcWidth, srcHeight, srcStride, dstStride)) {
|
if(LV_RESULT_OK == LV_DRAW_SW_ROTATE270_RGB888(src, dst, srcWidth, srcHeight, srcStride, dstStride)) {
|
||||||
return ;
|
return ;
|
||||||
|
|||||||
@@ -92,9 +92,9 @@ void test_rotate90_RGB888(void)
|
|||||||
uint8_t dstArray[2 * 3 * 3] = {0};
|
uint8_t dstArray[2 * 3 * 3] = {0};
|
||||||
|
|
||||||
uint8_t expectedArray[2 * 3 * 3] = {
|
uint8_t expectedArray[2 * 3 * 3] = {
|
||||||
0x44, 0x4A, 0x4B, 0x11, 0x1A, 0x1B,
|
0x33, 0x3A, 0x3B, 0x66, 0x6A, 0x6B,
|
||||||
0x55, 0x5A, 0x5B, 0x22, 0x2A, 0x2B,
|
0x22, 0x2A, 0x2B, 0x55, 0x5A, 0x5B,
|
||||||
0x66, 0x6A, 0x6B, 0x33, 0x3A, 0x3B,
|
0x11, 0x1A, 0x1B, 0x44, 0x4A, 0x4B,
|
||||||
};
|
};
|
||||||
|
|
||||||
lv_draw_sw_rotate(srcArray, dstArray,
|
lv_draw_sw_rotate(srcArray, dstArray,
|
||||||
@@ -139,9 +139,9 @@ void test_rotate270_RGB888(void)
|
|||||||
uint8_t dstArray[2 * 3 * 3] = {0};
|
uint8_t dstArray[2 * 3 * 3] = {0};
|
||||||
|
|
||||||
uint8_t expectedArray[2 * 3 * 3] = {
|
uint8_t expectedArray[2 * 3 * 3] = {
|
||||||
0x33, 0x3A, 0x3B, 0x66, 0x6A, 0x6B,
|
0x44, 0x4A, 0x4B, 0x11, 0x1A, 0x1B,
|
||||||
0x22, 0x2A, 0x2B, 0x55, 0x5A, 0x5B,
|
0x55, 0x5A, 0x5B, 0x22, 0x2A, 0x2B,
|
||||||
0x11, 0x1A, 0x1B, 0x44, 0x4A, 0x4B,
|
0x66, 0x6A, 0x6B, 0x33, 0x3A, 0x3B,
|
||||||
};
|
};
|
||||||
|
|
||||||
lv_draw_sw_rotate(srcArray, dstArray,
|
lv_draw_sw_rotate(srcArray, dstArray,
|
||||||
|
|||||||
Reference in New Issue
Block a user