blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

ncvisual_from_rgb_packed: correct alloc size, add unit test #1806

Browse Source
This commit is contained in:
nick black 2021-06-21 20:45:27 -04:00
parent bbc9f0e595
commit e4656dbd77
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/visual.c
View File

@ -606,7 +606,7 @@ ncvisual* ncvisual_from_rgb_packed(const void* rgba, int rows, int rowstride,
int cols, int alpha){
ncvisual* ncv = ncvisual_create();
if(ncv){
ncv->rowstride = pad_for_image(rowstride);
ncv->rowstride = pad_for_image(cols * 4);
ncv->pixx = cols;
ncv->pixy = rows;
uint32_t* data = malloc(ncv->rowstride * ncv->pixy);

18
src/tests/visual.cpp
View File

@ -28,6 +28,24 @@ TEST_CASE("Visual") {
}
}
// check that we properly populate RGB + A -> RGBA from 35x4 (see #1806)
SUBCASE("VisualFromRGBPacked35x4") {
unsigned char rgb[4 * 35 * 3] = "";
unsigned char alpha = 0xff;
auto ncv = ncvisual_from_rgb_packed(rgb, 4, 35 * 3, 35, alpha);
REQUIRE(nullptr != ncv);
for(int y = 0 ; y < 4 ; ++y){
for(int x = 0 ; x < 35 ; ++x){
uint32_t p;
CHECK(0 == ncvisual_at_yx(ncv, y, x, &p));
CHECK(ncpixel_r(p) == rgb[y * 6 + x * 3]);
CHECK(ncpixel_g(p) == rgb[y * 6 + x * 3 + 1]);
CHECK(ncpixel_b(p) == rgb[y * 6 + x * 3 + 2]);
CHECK(ncpixel_a(p) == alpha);
}
}
}
// check that we properly populate RGBx + A -> RGBA
SUBCASE("VisualFromRGBxPacked") {
unsigned char rgb[] = "\x88\x77\x66\x12\x55\x44\x33\x10\x22\x11\x00\xdd\x99\xaa\xbb\xcc";