diff options
| author | jt1134 <jt1134@gmail.com> | 2013-01-21 20:15:11 -0600 |
|---|---|---|
| committer | jt1134 <jt1134@gmail.com> | 2013-01-21 20:16:56 -0600 |
| commit | 64b672a4813ba24b1c19534841d9fb3847b2ab9e (patch) | |
| tree | 286c3e3807b74c61d917f5aa10c4524f36a61949 /recovery | |
| parent | 5d548e71c0ee61c52bf44642829bdd002f84346f (diff) | |
| download | device_samsung_aries-common-64b672a4813ba24b1c19534841d9fb3847b2ab9e.zip device_samsung_aries-common-64b672a4813ba24b1c19534841d9fb3847b2ab9e.tar.gz device_samsung_aries-common-64b672a4813ba24b1c19534841d9fb3847b2ab9e.tar.bz2 | |
recovery: graphics.c: remove dead code and change font to roboto
Change-Id: I34746cd13b95264cc4ab7f42145474ee007de8e4
Diffstat (limited to 'recovery')
| -rw-r--r-- | recovery/graphics.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/recovery/graphics.c b/recovery/graphics.c index 87e4e29..7af58bc 100644 --- a/recovery/graphics.c +++ b/recovery/graphics.c @@ -29,11 +29,7 @@ #include <pixelflinger/pixelflinger.h> -#ifndef BOARD_LDPI_RECOVERY - #include "font_10x18.h" -#else - #include "font_7x16.h" -#endif +#include "roboto_10x18.h" #include "minui.h" @@ -90,11 +86,7 @@ static int get_framebuffer(GGLSurface *fb) fb->version = sizeof(*fb); fb->width = vi.xres; fb->height = vi.yres; -#ifdef BOARD_HAS_JANKY_BACKBUFFER - fb->stride = fi.line_length/2; -#else fb->stride = vi.xres; -#endif fb->data = bits; fb->format = GGL_PIXEL_FORMAT_RGB_565; memset(fb->data, 0, vi.yres * vi.xres * 2); @@ -104,13 +96,8 @@ static int get_framebuffer(GGLSurface *fb) fb->version = sizeof(*fb); fb->width = vi.xres; fb->height = vi.yres; -#ifdef BOARD_HAS_JANKY_BACKBUFFER - fb->stride = fi.line_length/2; - fb->data = (void*) (((unsigned) bits) + vi.yres * fi.line_length); -#else fb->stride = vi.xres; fb->data = (void*) (((unsigned) bits) + vi.yres * vi.xres * 2); -#endif fb->format = GGL_PIXEL_FORMAT_RGB_565; memset(fb->data, 0, vi.yres * vi.xres * 2); @@ -144,16 +131,6 @@ void gr_flip(void) /* swap front and back buffers */ gr_active_fb = (gr_active_fb + 1) & 1; -#ifdef BOARD_HAS_FLIPPED_SCREEN - /* flip buffer 180 degrees for devices with physicaly inverted screens */ - unsigned int i; - for (i = 1; i < (vi.xres * vi.yres); i++) { - unsigned short tmp = gr_mem_surface.data[i]; - gr_mem_surface.data[i] = gr_mem_surface.data[(vi.xres * vi.yres * 2) - i]; - gr_mem_surface.data[(vi.xres * vi.yres * 2) - i] = tmp; - } -#endif - /* copy data from the in-memory surface to the buffer we're about * to make active. */ memcpy(gr_framebuffer[gr_active_fb].data, gr_mem_surface.data, |