diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-17 16:11:02 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2014-03-17 16:11:02 -0700 |
| commit | 80c1a386d3f614919708b37986919ecaf74ee738 (patch) | |
| tree | 2dda152c800117f1f6c7e789c7fb88bd5640f89b /minui/graphics.c | |
| parent | 4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (diff) | |
| parent | d90da13076303a5377de631623e16c34ee195830 (diff) | |
| download | bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.zip bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.gz bootable_recovery-80c1a386d3f614919708b37986919ecaf74ee738.tar.bz2 | |
resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
Diffstat (limited to 'minui/graphics.c')
| -rw-r--r-- | minui/graphics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/minui/graphics.c b/minui/graphics.c index f8ffa89..32b3361 100644 --- a/minui/graphics.c +++ b/minui/graphics.c @@ -269,7 +269,7 @@ static void gr_init_font(void) { gr_font = calloc(sizeof(*gr_font), 1); - int res = res_create_surface("font", &(gr_font->texture)); + int res = res_create_alpha_surface("font", &(gr_font->texture)); if (res == 0) { // The font image should be a 96x2 array of character images. The // columns are the printable ASCII characters 0x20 - 0x7f. The |