diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:35 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:35 +1000 |
commit | 0771c148171b8cb6235086402275a4e82d3ea342 (patch) | |
tree | 74313a4d468a92f5510d23a6c35a3c95bfce8e86 /src | |
parent | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (diff) | |
parent | bee02d5bb58800104a6dd7490ec2424dacecf625 (diff) | |
download | uGFX-0771c148171b8cb6235086402275a4e82d3ea342.tar.gz uGFX-0771c148171b8cb6235086402275a4e82d3ea342.tar.bz2 uGFX-0771c148171b8cb6235086402275a4e82d3ea342.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src')
-rw-r--r-- | src/gdisp/mcufont/mf_wordwrap.c | 7 | ||||
-rw-r--r-- | src/gos/gos_qt.cpp | 7 | ||||
-rw-r--r-- | src/gos/gos_qt.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/gdisp/mcufont/mf_wordwrap.c b/src/gdisp/mcufont/mf_wordwrap.c index 6403722d..de684ca1 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. */ diff --git a/src/gos/gos_qt.cpp b/src/gos/gos_qt.cpp index e7480dd2..c6eb6f8d 100644 --- a/src/gos/gos_qt.cpp +++ b/src/gos/gos_qt.cpp @@ -13,6 +13,7 @@ #include <QThread> #include <QElapsedTimer> +extern "C" void _gosPostInit(void); class Thread : public QThread { @@ -86,6 +87,12 @@ void* gfxAlloc(size_t sz) return malloc(sz); } +void* gfxRealloc(void* ptr, size_t oldsz, size_t newsz) +{ + Q_UNUSED(oldsz) + 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); |