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

[sixel] vertically condesnsify this code a little

Browse Source
This commit is contained in:
nick black 2021-12-24 15:07:57 -05:00
parent abacb08280
commit 2580513d1a
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/sixel.c
View File

@ -669,22 +669,19 @@ write_rle(int* printed, int color, fbuf* f, int seenrle, unsigned char crle,
static inline int
write_sixel_intro(fbuf* f, sixel_p2_e p2, int leny, int lenx){
int r = fbuf_puts(f, "\x1bP0;");
int rr, r = fbuf_puts(f, "\x1bP0;");
if(r < 0){
return -1;
}
int rr = fbuf_putint(f, p2);
if(rr < 0){
if((rr = fbuf_putint(f, p2)) < 0){
return -1;
}
r += rr;
rr = fbuf_puts(f, ";0q\"1;1;");
if(rr < 0){
if((rr = fbuf_puts(f, ";0q\"1;1;")) < 0){
return -1;
}
r += rr;
rr = fbuf_putint(f, lenx);
if(rr < 0){
if((rr = fbuf_putint(f, lenx)) < 0){
return -1;
}
r += rr;
@ -692,8 +689,7 @@ write_sixel_intro(fbuf* f, sixel_p2_e p2, int leny, int lenx){
return -1;
}
++r;
rr = fbuf_putint(f, leny);
if(rr < 0){
if((rr = fbuf_putint(f, leny)) < 0){
return -1;
}
r += rr;
@ -703,23 +699,20 @@ write_sixel_intro(fbuf* f, sixel_p2_e p2, int leny, int lenx){
// write a single color register. rc/gc/bc are on [0..100].
static inline int
write_sixel_creg(fbuf* f, int idx, int rc, int gc, int bc){
int r = 0;
int rr, r = 0;
if(fbuf_putc(f, '#') != 1){
return -1;
}
++r;
int rr = fbuf_putint(f, idx);
if(rr < 0){
if((rr = fbuf_putint(f, idx)) < 0){
return -1;
}
r += rr;
rr = fbuf_puts(f, ";2;");
if(rr < 0){
if((rr = fbuf_puts(f, ";2;")) < 0){
return -1;
}
r += rr;
rr = fbuf_putint(f, rc);
if(rr < 0){
if((rr = fbuf_putint(f, rc)) < 0){
return -1;
}
r += rr;
@ -727,8 +720,7 @@ write_sixel_creg(fbuf* f, int idx, int rc, int gc, int bc){
return -1;
}
++r;
rr = fbuf_putint(f, gc);
if(rr < 0){
if((rr = fbuf_putint(f, gc)) < 0){
return -1;
}
r += rr;
@ -736,8 +728,7 @@ write_sixel_creg(fbuf* f, int idx, int rc, int gc, int bc){
return -1;
}
++r;
rr = fbuf_putint(f, bc);
if(rr < 0){
if((rr = fbuf_putint(f, bc)) < 0){
return -1;
}
r += rr;

3
src/poc/quantanal.c
View File

@ -45,7 +45,7 @@ compare(const struct ncvisual* n1, const struct ncvisual* n2,
}
ncplane_putchar(stdn, '\n');
double p = lx * ly;
ncplane_printf(stdn, " %gpx Δr %"PRIu64" (%.03g) Δg %"PRIu64" (%.03g) Δb %"PRIu64 " (%.03g)\n",
ncplane_printf(stdn, " %.0fpx Δr %"PRIu64" (%.03g) Δg %"PRIu64" (%.03g) Δb %"PRIu64 " (%.03g)\n",
p, rdelta, rdelta / p, gdelta, gdelta / p, bdelta, bdelta / p);
ncplane_printf(stdn, " avg diff per pixel: %.03g\n", (rdelta + gdelta + bdelta) / p);
notcurses_render(nc);
@ -95,6 +95,7 @@ int main(int argc, char** argv){
if(ncvisual_geom(nc, ncv, &vopts, &geom)){
ncplane_set_fg_rgb(stdn, 0xd16002);
ncplane_printf(stdn, " Image too large, scaling to display\n");
notcurses_render(nc);
vopts.scaling = NCSCALE_STRETCH;
if(ncvisual_geom(nc, ncv, &vopts, &geom)){
notcurses_stop(nc);