[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] 56/93: no bugs with uint8_t, but display is divided in
From: |
gnunet |
Subject: |
[taler-taler-mdb] 56/93: no bugs with uint8_t, but display is divided in 4 pieces |
Date: |
Mon, 18 Nov 2019 21:13:19 +0100 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a commit to branch master
in repository taler-mdb.
commit eca20f0a874ebb73e55c243882c10c44b5e50b9e
Author: Boss Marco <address@hidden>
AuthorDate: Fri Nov 15 09:48:53 2019 +0100
no bugs with uint8_t, but display is divided in 4 pieces
---
src/main.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main.c b/src/main.c
index 5b4eb37..ce9a569 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,7 +138,7 @@ struct Display
{
int devicefd;
- uint16_t *memory;
+ uint8_t *memory;
struct fb_var_screeninfo orig_vinfo;
@@ -190,12 +190,11 @@ show_qrcode (const char *uri)
{
QRinput *qri;
QRcode *qrc;
- uint16_t *pixels;
+ uint8_t *pixels;
unsigned int size;
char *upper;
- /* FIXME ? SEGSEV on line 277 when size >= 5 */
- const unsigned int scale = 4;
+ const unsigned int scale = 8;
const unsigned int n_channels = 3;
/* open the framebuffer device */
@@ -219,10 +218,10 @@ show_qrcode (const char *uri)
&qrDisplay.var_info,
sizeof(struct fb_var_screeninfo));
- if (qrDisplay.var_info.bits_per_pixel != 16)
+ if (qrDisplay.var_info.bits_per_pixel != 8)
{
/* Change variable info to 8bit per pixel */
- qrDisplay.var_info.bits_per_pixel = 16;
+ qrDisplay.var_info.bits_per_pixel = 8;
if (0 > ioctl (qrDisplay.devicefd,
FBIOPUT_VSCREENINFO,
&qrDisplay.var_info))
@@ -242,11 +241,11 @@ show_qrcode (const char *uri)
}
/* get pointer onto frame buffer */
- qrDisplay.memory = (uint16_t *) mmap (NULL,
- qrDisplay.fix_info.smem_len,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- qrDisplay.devicefd,
- 0);
+ qrDisplay.memory = (uint8_t *) mmap (NULL,
+ qrDisplay.fix_info.smem_len,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ qrDisplay.devicefd,
+ 0);
if (0 > qrDisplay.devicefd)
{
printf ("failed to map display memory\n");
@@ -301,11 +300,11 @@ show_qrcode (const char *uri)
(x * qrc->width / size) + (y * qrc->width / size) * qrc->width;
for (unsigned int c = 0; c < n_channels; c++)
pixels[(y * size + x) * n_channels + c] =
- (0 == (qrc->data[off] & 1)) ? 0xFFFF : 0x0000;
+ (0 == (qrc->data[off] & 1)) ? 0xFF : 0x00;
}
- /* FIXME ? free errors */
- // QRcode_free (qrc);
- // QRinput_free (qri);
+
+ QRcode_free (qrc);
+ QRinput_free (qri);
/* show the qrcode */
size_t width = qrDisplay.var_info.xres;
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-taler-mdb] 18/93: GNUnet logs added, -h option added, (continued)
- [taler-taler-mdb] 18/93: GNUnet logs added, -h option added, gnunet, 2019/11/18
- [taler-taler-mdb] 27/93: fixes, gnunet, 2019/11/18
- [taler-taler-mdb] 41/93: this was fixed, gnunet, 2019/11/18
- [taler-taler-mdb] 44/93: prepare logic for generation of QR codes, gnunet, 2019/11/18
- [taler-taler-mdb] 29/93: dce, gnunet, 2019/11/18
- [taler-taler-mdb] 48/93: comment added, gnunet, 2019/11/18
- [taler-taler-mdb] 64/93: qr gen, gnunet, 2019/11/18
- [taler-taler-mdb] 55/93: better solution, still bugs, gnunet, 2019/11/18
- [taler-taler-mdb] 53/93: bug detected, see README, gnunet, 2019/11/18
- [taler-taler-mdb] 60/93: fix, gnunet, 2019/11/18
- [taler-taler-mdb] 56/93: no bugs with uint8_t, but display is divided in 4 pieces,
gnunet <=
- [taler-taler-mdb] 61/93: qr gen, gnunet, 2019/11/18
- [taler-taler-mdb] 59/93: when no display, show on stdout, gnunet, 2019/11/18
- [taler-taler-mdb] 54/93: first (half working) qrcode, gnunet, 2019/11/18
- [taler-taler-mdb] 52/93: stop NFC interaction after payment succeeded, gnunet, 2019/11/18
- [taler-taler-mdb] 58/93: fix, gnunet, 2019/11/18
- [taler-taler-mdb] 65/93: qr gen, gnunet, 2019/11/18
- [taler-taler-mdb] 57/93: stick to convention, gnunet, 2019/11/18
- [taler-taler-mdb] 49/93: intermediary commit, gnunet, 2019/11/18
- [taler-taler-mdb] 62/93: qr gen, gnunet, 2019/11/18
- [taler-taler-mdb] 47/93: Merge branch 'refactor' of https://git.taler.net/taler-mdb into refactor, gnunet, 2019/11/18