From 23abfd37a55f281186f9275ad35b7182efd2e8b6 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 27 Jul 2016 10:19:47 -0700 Subject: Fix clang-tidy performance warnings. * Use const reference parameter type to avoid unnecessary copy. * Use more efficient overloaded string methods. Bug: 30407689 Bug: 30411878 Change-Id: Iefab05c077367f272abf545036b853e8a295c8cd Test: build with WITH_TIDY=1 --- minui/minui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h index e3bc00548..b2648fb33 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -67,7 +67,7 @@ typedef int (*ev_set_key_callback)(int code, int value, void* data); int ev_init(ev_callback input_cb, void* data); void ev_exit(); int ev_add_fd(int fd, ev_callback cb, void* data); -void ev_iterate_available_keys(std::function f); +void ev_iterate_available_keys(const std::function& f); int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data); // 'timeout' has the same semantics as poll(2). -- cgit v1.2.3 From 9a259772ccf1e9708baecc559323ac5b6229e954 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 28 Jul 2016 14:15:00 -0700 Subject: Add docs on regeneration background text image Also add a missing string in the recovery_l10n APP. Bug: 30415666 Change-Id: Ice2a9f7cad4ebe332b427bc0c7a9adccb6cf3af3 --- minui/minui.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h index b2648fb33..d572205f3 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -111,8 +111,8 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface); // given locale. The image is expected to be a composite of multiple // translations of the same text, with special added rows that encode // the subimages' size and intended locale in the pixel data. See -// development/tools/recovery_l10n for an app that will generate these -// specialized images from Android resources. +// bootable/recovery/tools/recovery_l10n for an app that will generate +// these specialized images from Android resources. int res_create_localized_alpha_surface(const char* name, const char* locale, GRSurface** pSurface); -- cgit v1.2.3 From 0ecbd76b220ba6f3d02fa028b9c6481f7fb5c089 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 16 Jan 2017 21:16:58 -0800 Subject: minui: Export minui/minui.h. For libminui static and shared libraries. Test: build Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16 --- minui/minui.h | 135 ---------------------------------------------------------- 1 file changed, 135 deletions(-) delete mode 100644 minui/minui.h (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h deleted file mode 100644 index 78890b84b..000000000 --- a/minui/minui.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _MINUI_H_ -#define _MINUI_H_ - -#include - -#include - -// -// Graphics. -// - -struct GRSurface { - int width; - int height; - int row_bytes; - int pixel_bytes; - unsigned char* data; -}; - -struct GRFont { - GRSurface* texture; - int char_width; - int char_height; -}; - -int gr_init(); -void gr_exit(); - -int gr_fb_width(); -int gr_fb_height(); - -void gr_flip(); -void gr_fb_blank(bool blank); - -void gr_clear(); // clear entire surface to current color -void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a); -void gr_fill(int x1, int y1, int x2, int y2); - -void gr_texticon(int x, int y, GRSurface* icon); - -const GRFont* gr_sys_font(); -int gr_init_font(const char* name, GRFont** dest); -void gr_text(const GRFont* font, int x, int y, const char *s, bool bold); -int gr_measure(const GRFont* font, const char *s); -void gr_font_size(const GRFont* font, int *x, int *y); - -void gr_blit(GRSurface* source, int sx, int sy, int w, int h, int dx, int dy); -unsigned int gr_get_width(GRSurface* surface); -unsigned int gr_get_height(GRSurface* surface); - -// -// Input events. -// - -struct input_event; - -// TODO: move these over to std::function. -typedef int (*ev_callback)(int fd, uint32_t epevents, void* data); -typedef int (*ev_set_key_callback)(int code, int value, void* data); - -int ev_init(ev_callback input_cb, void* data); -void ev_exit(); -int ev_add_fd(int fd, ev_callback cb, void* data); -void ev_iterate_available_keys(const std::function& f); -int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data); - -// 'timeout' has the same semantics as poll(2). -// 0 : don't block -// < 0 : block forever -// > 0 : block for 'timeout' milliseconds -int ev_wait(int timeout); - -int ev_get_input(int fd, uint32_t epevents, input_event* ev); -void ev_dispatch(); -int ev_get_epollfd(); - -// -// Resources -// - -bool matches_locale(const char* prefix, const char* locale); - -// res_create_*_surface() functions return 0 if no error, else -// negative. -// -// A "display" surface is one that is intended to be drawn to the -// screen with gr_blit(). An "alpha" surface is a grayscale image -// interpreted as an alpha mask used to render text in the current -// color (with gr_text() or gr_texticon()). -// -// All these functions load PNG images from "/res/images/${name}.png". - -// Load a single display surface from a PNG image. -int res_create_display_surface(const char* name, GRSurface** pSurface); - -// Load an array of display surfaces from a single PNG image. The PNG -// should have a 'Frames' text chunk whose value is the number of -// frames this image represents. The pixel data itself is interlaced -// by row. -int res_create_multi_display_surface(const char* name, int* frames, - int* fps, GRSurface*** pSurface); - -// Load a single alpha surface from a grayscale PNG image. -int res_create_alpha_surface(const char* name, GRSurface** pSurface); - -// Load part of a grayscale PNG image that is the first match for the -// given locale. The image is expected to be a composite of multiple -// translations of the same text, with special added rows that encode -// the subimages' size and intended locale in the pixel data. See -// bootable/recovery/tools/recovery_l10n for an app that will generate -// these specialized images from Android resources. -int res_create_localized_alpha_surface(const char* name, const char* locale, - GRSurface** pSurface); - -// Free a surface allocated by any of the res_create_*_surface() -// functions. -void res_free_surface(GRSurface* surface); - -#endif -- cgit v1.2.3