Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c91612d4 authored by Doug Zongker's avatar Doug Zongker Committed by Gerrit Code Review
Browse files

Merge "remove pixelflinger from recovery"

parents 8f087d02 16f97c39
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ LOCAL_STATIC_LIBRARIES := \
    libmincrypt \
    libminadbd \
    libminui \
    libpixelflinger_static \
    libpng \
    libfs_mgr \
    libcutils \
+302 −197

File changed.

Preview size limit exceeded, changes collapsed.

+13 −5
Original line number Diff line number Diff line
@@ -23,21 +23,29 @@
extern "C" {
#endif

typedef void* gr_surface;
typedef unsigned short gr_pixel;
typedef struct {
    int width;
    int height;
    int row_bytes;
    int pixel_bytes;
    unsigned char* data;
} GRSurface;

typedef GRSurface* gr_surface;

int gr_init(void);
void gr_exit(void);

int gr_fb_width(void);
int gr_fb_height(void);
gr_pixel *gr_fb_data(void);

void gr_flip(void);
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);
int gr_text(int x, int y, const char *s, int bold);
void gr_text(int x, int y, const char *s, int bold);
void gr_texticon(int x, int y, gr_surface icon);
int gr_measure(const char *s);
void gr_font_size(int *x, int *y);
+33 −64

File changed.

Preview size limit exceeded, changes collapsed.

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@
#include "cutils/log.h"
#include "mtdutils.h"

#ifdef LOG_TAG
#undef LOG_TAG
#endif
#define LOG_TAG "flash_image"

#define HEADER_SIZE 2048  // size of header to compare for equality
Loading