Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-10-31 15:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sixel] correct deepclean #1580

Browse Source
This commit is contained in:
nick black 2021-04-23 14:55:36 -04:00
parent 68db5d5df6
commit b58919f145
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/sixel.c
View File

@ -534,40 +534,45 @@ int sixel_delete(const notcurses* nc, const ncpile* p, FILE* out, sprixel* s){
// our input, and keep your CVEs to yourselves. remember that this covers six
// rows at a time, [y..y + 5].
static int
deepclean_output(FILE* fp, const sprixel* s, int y, int *x, int* rle,
deepclean_output(FILE* fp, const sprixel* s, int y, int *x, int rle,
int* printed, int color, int* needclosure, char c){
c -= 63;
int rlei = 0;
// xi loops over the section we cover, a minimum of 1 pixel and a maximum
// of one line. FIXME can skip (celldimx - 1) / celldimx checks, do so!
for(int xi = *x ; xi < *x + *rle ; ++xi){
unsigned char mask = 0x3f; // assume all six bits are valid
for(int xi = *x ; xi < *x + rle ; ++xi){
unsigned char mask = 0;
for(int yi = y ; yi < y + 6 ; ++yi){
const int tidx = (yi / s->cellpxy) * s->dimx + (xi / s->cellpxx);
const bool nihil = (s->n->tacache[tidx] == SPRIXCELL_ANNIHILATED);
if(nihil){
mask &= ~(1u << (yi - y));
if(!nihil){
mask |= (1u << (yi - y));
}
}
if((c & mask) != c){
if(rlei){
if(write_rle(printed, color, fp, rlei, c & mask, needclosure)){
//fprintf(stderr, "writing %d:%d..%d (%c)\n", y, xi, xi + rlei - 1, c + 63);
if(write_rle(printed, color, fp, rlei, c, needclosure)){
return -1;
}
rlei = 0;
}
// FIXME can rle on this
if(write_rle(printed, color, fp, 1, c & mask, needclosure)){
return -1;
}
}else{
++rlei;
}
}
*x += *rle;
if(rlei){
//fprintf(stderr, "writing %d:%d..%d (%c)\n", y, *x - (rle - rlei), *x + rlei - 1, c + 63);
if(write_rle(printed, color, fp, rlei, c, needclosure)){
return -1;
}
rlei = 0;
}
*rle = 1;
*x += rle;
return 0;
}
@ -663,10 +668,11 @@ deepclean_stream(sprixel* s, FILE* fp){
}else if(c < 63 || c > 126){
return -1;
}else{ // data byte
if(deepclean_output(fp, s, y, &x, &rle, &printed, color,
if(deepclean_output(fp, s, y, &x, rle, &printed, color,
&needclosure, c)){
return -1;
}
rle = 1;
}
}
++idx;