diff options
author | Damien Zammit <damien@zamaudio.com> | 2015-02-17 11:59:35 +1100 |
---|---|---|
committer | Damien Zammit <damien@zamaudio.com> | 2015-02-17 11:59:35 +1100 |
commit | 78883fa7f7ea9d85477a27ed3c569a899ee305fb (patch) | |
tree | f1add63ce6f3af86340d7e4c93092776b5479b14 /libs/dgl/src/nanovg/fontstash.h | |
parent | af7a094a0c0e8b658736d77361a2d8d2f99b0006 (diff) | |
parent | 8da011deb152227714196f61eab26e1af37a2890 (diff) |
Merge pull request #24 from falkTX/master
Update DPF, inital file-browser for ZamSFZ
Diffstat (limited to 'libs/dgl/src/nanovg/fontstash.h')
-rw-r--r-- | libs/dgl/src/nanovg/fontstash.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/dgl/src/nanovg/fontstash.h b/libs/dgl/src/nanovg/fontstash.h index 7fb8955..a97ce53 100644 --- a/libs/dgl/src/nanovg/fontstash.h +++ b/libs/dgl/src/nanovg/fontstash.h @@ -41,7 +41,7 @@ enum FONSalign { enum FONSerrorCode { // Font atlas is full. FONS_ATLAS_FULL = 1, - // Scratch memory used to render glyphs is full, requested size reported in 'val', you may need to bump up FONS_SCRATCH_BUF_SIZE. + // Scratch memory used to render glyphs is full, requested size reported in 'val', you may need to bump up FONS_SCRATCH_BUF_SIZE. FONS_SCRATCH_FULL = 2, // Calls to fonsPushState has craeted too large stack, if you need deep state stack bump up FONS_MAX_STATES. FONS_STATES_OVERFLOW = 3, @@ -85,7 +85,7 @@ void fonsDeleteInternal(struct FONScontext* s); void fonsSetErrorCallback(struct FONScontext* s, void (*callback)(void* uptr, int error, int val), void* uptr); // Returns current atlas size. void fonsGetAtlasSize(struct FONScontext* s, int* width, int* height); -// Expands the atlas size. +// Expands the atlas size. int fonsExpandAtlas(struct FONScontext* s, int width, int height); // Reseta the whole stash. int fonsResetAtlas(struct FONScontext* stash, int width, int height); @@ -1388,7 +1388,7 @@ void fonsDrawDebug(struct FONScontext* stash, float x, float y) } float fonsTextBounds(struct FONScontext* stash, - float x, float y, + float x, float y, const char* str, const char* end, float* bounds) { @@ -1576,7 +1576,7 @@ int fonsExpandAtlas(struct FONScontext* stash, int width, int height) height = fons__maxi(height, stash->params.height); if (width == stash->params.width && height == stash->params.height) - return 1; + return 1; // Flush pending glyphs. fons__flush(stash); |