From 861e6b98696f23d01c35f00dcf29fce51acd14c5 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 20 Feb 2018 14:51:37 +0100 Subject: [PATCH 1/8] Defined gfxRealloc() for GFX_USE_OS_QT --- src/gos/gos_qt.cpp | 5 +++++ src/gos/gos_qt.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index e7480dd2..8a8e2bd1 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -86,6 +86,11 @@ void* gfxAlloc(size_t sz) return malloc(sz); } +void* gfxRealloc(void* ptr, size_t oldsz, size_t newsz) +{ + return realloc(ptr, newsz); +} + void gfxFree(void* ptr) { free(ptr); diff --git a/src/gos/gos_qt.h b/src/gos/gos_qt.h index 45d743f5..75947242 100644 --- a/src/gos/gos_qt.h +++ b/src/gos/gos_qt.h @@ -45,6 +45,7 @@ void _gosDeinit(); void gfxHalt(const char* msg); void gfxExit(void); void* gfxAlloc(size_t sz); +void* gfxRealloc(void *ptr, size_t oldsz, size_t newsz); void gfxFree(void* ptr); void gfxYield(void); void gfxSleepMilliseconds(delaytime_t ms); From 9e51a3e58660bbb500c9699bd912a16e989820c3 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 20 Feb 2018 14:53:17 +0100 Subject: [PATCH 2/8] _gosPostInit() needs to be in C --- src/gos/gos_qt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index 8a8e2bd1..e34fbfb1 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -13,6 +13,7 @@ #include #include +extern "C" void _gosPostInit(void); class Thread : public QThread { From 992850bcb1992ff052d5ac2379e4675a34861723 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 20 Feb 2018 14:54:02 +0100 Subject: [PATCH 3/8] Compiler satisfaction --- src/gos/gos_qt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index e34fbfb1..7ca6be2e 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -89,6 +89,7 @@ void* gfxAlloc(size_t sz) void* gfxRealloc(void* ptr, size_t oldsz, size_t newsz) { + Q_UNUSED(oldsz) return realloc(ptr, newsz); } From 3cb7afbdec9ab707d637d0a4a78da33fbab3c8a3 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 6 Mar 2018 09:42:00 +0100 Subject: [PATCH 4/8] Tab to spaces --- src/gos/gos_qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index 7ca6be2e..c6eb6f8d 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -90,7 +90,7 @@ void* gfxAlloc(size_t sz) void* gfxRealloc(void* ptr, size_t oldsz, size_t newsz) { Q_UNUSED(oldsz) - return realloc(ptr, newsz); + return realloc(ptr, newsz); } void gfxFree(void* ptr) From bbc4b8e5516a934014edf754bc5b6b877eabfcf7 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Fri, 2 Mar 2018 15:50:16 +0100 Subject: [PATCH 5/8] Added clone() method to DataFile class --- tools/mcufontencoder/src/datafile.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/mcufontencoder/src/datafile.hh b/tools/mcufontencoder/src/datafile.hh index 460e6039..b5e1d538 100644 --- a/tools/mcufontencoder/src/datafile.hh +++ b/tools/mcufontencoder/src/datafile.hh @@ -51,6 +51,8 @@ public: DataFile(const std::vector &dictionary, const std::vector &glyphs, const fontinfo_t &fontinfo); + + inline DataFile * clone() const { return new DataFile(GetDictionary(), GetGlyphTable(), GetFontInfo()); } // Save to a file (custom format) void Save(std::ostream &file) const; From 50cc1ad5967f970405da519ee1195fca2d6c3713 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Fri, 2 Mar 2018 15:49:37 +0100 Subject: [PATCH 6/8] Typo in mcufontencoder help --- tools/mcufontencoder/src/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mcufontencoder/src/main.cc b/tools/mcufontencoder/src/main.cc index 70cd9132..a51b7451 100644 --- a/tools/mcufontencoder/src/main.cc +++ b/tools/mcufontencoder/src/main.cc @@ -443,7 +443,7 @@ static const char *usage_msg = " rlefont_show_encoded Show the encoded data for debugging.\n" "\n" "Commands specific to bwfont format:\n" - " bwfont_export [outfile Export to .c source code.\n" + " bwfont_export [outfile] Export to .c source code.\n" ""; typedef status_t (*cmd_t)(const std::vector &args); From 509b4113ad340bf721ce58e645d1498a65cdad65 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 20 Feb 2018 16:30:53 +0100 Subject: [PATCH 7/8] Got stuck in here with a source font file generated out of `arial` size 48 --- src/gdisp/mcufont/mf_wordwrap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gdisp/mcufont/mf_wordwrap.c b/src/gdisp/mcufont/mf_wordwrap.c index 6403722d..a1df041f 100644 --- a/src/gdisp/mcufont/mf_wordwrap.c +++ b/src/gdisp/mcufont/mf_wordwrap.c @@ -179,6 +179,7 @@ void mf_wordwrap(const struct mf_font_s *font, int16_t width, struct linelen_s current = { 0 }; struct linelen_s previous = { 0 }; bool full; + uint32_t giveUp = 2048; // Do while-loop a maximum of x times current.start = text; @@ -214,6 +215,12 @@ void mf_wordwrap(const struct mf_font_s *font, int16_t width, current.last_word.space = 0; current.last_word.chars = 0; } + + giveUp--; + if (giveUp == 0) + { + break; + } } /* Dispatch the last lines. */ From bee02d5bb58800104a6dd7490ec2424dacecf625 Mon Sep 17 00:00:00 2001 From: Thomas Sterren Date: Tue, 20 Feb 2018 16:35:34 +0100 Subject: [PATCH 8/8] C comment style --- src/gdisp/mcufont/mf_wordwrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gdisp/mcufont/mf_wordwrap.c b/src/gdisp/mcufont/mf_wordwrap.c index a1df041f..de684ca1 100644 --- a/src/gdisp/mcufont/mf_wordwrap.c +++ b/src/gdisp/mcufont/mf_wordwrap.c @@ -179,7 +179,7 @@ void mf_wordwrap(const struct mf_font_s *font, int16_t width, struct linelen_s current = { 0 }; struct linelen_s previous = { 0 }; bool full; - uint32_t giveUp = 2048; // Do while-loop a maximum of x times + uint32_t giveUp = 2048; /* Do while-loop a maximum of x times */ current.start = text;