Changeset 8565a42 in mainline for uspace/lib/draw/font/embedded.c
- Timestamp:
- 2018-03-02T20:34:50Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
-
uspace/lib/draw/font/embedded.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/draw/font/embedded.c
r3061bc1 r8565a42 51 51 if (!found) 52 52 return ENOENT; 53 53 54 54 *glyph_id = glyph; 55 55 return EOK; … … 62 62 if (!surface) 63 63 return ENOMEM; 64 64 65 65 for (unsigned int y = 0; y < FONT_SCANLINES; ++y) { 66 66 for (unsigned int x = 0; x < FONT_WIDTH; ++x) { … … 70 70 } 71 71 } 72 72 73 73 *out_surface = surface; 74 74 return EOK; … … 84 84 gm->ascender = FONT_ASCENDER; 85 85 gm->height = FONT_SCANLINES; 86 86 87 87 return EOK; 88 88 }
Note:
See TracChangeset
for help on using the changeset viewer.
