blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

qrcode: force 2x1 blitter

Browse Source 
only the 2x1 blitter can generate the proper aspect ratio
needed for qrcodes, so force its use with
NCVISUAL_OPTION_NODEGRADE. see PR #2806.
This commit is contained in:
nick black 2024-11-16 17:29:11 -05:00 committed by nick black
parent fc2636ad01
commit a5c7d2262a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS.md
View File

@ -1,6 +1,11 @@
This document attempts to list user-visible changes and any major internal This document attempts to list user-visible changes and any major internal
rearrangements of Notcurses. rearrangements of Notcurses.
* 3.0.12 (not yet released)
* Fixed a bug when rendering QR codes into a small area. QR codes now
require NCBLIT_2x1, as that is the only blitter which can generate a
proper aspect ratio. It thus no longer works in an ASCII environment.
* 3.0.11 (2024-10-02) * 3.0.11 (2024-10-02)
* We now normalize the return of `nl_langinfo()` according to the behavior * We now normalize the return of `nl_langinfo()` according to the behavior
of glibc's `_nl_normalize_charset()`, supporting some atypical synonyms of glibc's `_nl_normalize_charset()`, supporting some atypical synonyms

2
include/notcurses/notcurses.h
View File

@ -4591,6 +4591,8 @@ API int ncsubproc_destroy(struct ncsubproc* n);
// returned. Otherwise, the QR code "version" (size) is returned. The QR code // returned. Otherwise, the QR code "version" (size) is returned. The QR code
// is (version * 4 + 17) columns wide, and ⌈version * 4 + 17⌉ rows tall (the // is (version * 4 + 17) columns wide, and ⌈version * 4 + 17⌉ rows tall (the
// properly-scaled values are written back to '*ymax' and '*xmax'). // properly-scaled values are written back to '*ymax' and '*xmax').
// NCBLIT_2x1 is always used, and the call will fail if it is not available,
// as only this blitter can generate a proper aspect ratio.
API int ncplane_qrcode(struct ncplane* n, unsigned* ymax, unsigned* xmax, API int ncplane_qrcode(struct ncplane* n, unsigned* ymax, unsigned* xmax,
const void* data, size_t len) const void* data, size_t len)
__attribute__ ((nonnull (1, 4))); __attribute__ ((nonnull (1, 4)));

3
src/lib/fill.c
View File

@ -619,9 +619,12 @@ int ncplane_qrcode(ncplane* n, unsigned* ymax, unsigned* xmax, const void* data,
free(rgba); free(rgba);
if(ncv){ if(ncv){
ret = square; ret = square;
// we don't allow degredation because 2x1 is the only blitter which
// can generate a qrcode with proper aspect ratio. ascii is thus out.
struct ncvisual_options vopts = { struct ncvisual_options vopts = {
.n = n, .n = n,
.blitter = blitfxn, .blitter = blitfxn,
.flags = NCVISUAL_OPTION_NODEGRADE,
}; };
if(ncvisual_blit(ncplane_notcurses(n), ncv, &vopts) == n){ if(ncvisual_blit(ncplane_notcurses(n), ncv, &vopts) == n){
ret = square; ret = square;