sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

stkutil: Convert stk_image_to_xpm to ell

This commit is contained in:
Denis Kenzior 2018-12-27 12:21:03 -06:00
parent 1d08969613
commit f7d8edeaac
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sim.c
View File

@ -929,7 +929,7 @@ static void sim_get_image_cb(struct ofono_sim *sim,
if (cache) if (cache)
sim_fs_cache_image(sim->simfs, (const char *) xpm, id); sim_fs_cache_image(sim->simfs, (const char *) xpm, id);
g_free(xpm); l_free(xpm);
} }
static void sim_iidf_read_clut_cb(int ok, int length, int record, static void sim_iidf_read_clut_cb(int ok, int length, int record,

30
src/stkutil.c
View File

@ -6417,7 +6417,7 @@ char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
unsigned int ncolors, nbits, entry, cpp; unsigned int ncolors, nbits, entry, cpp;
unsigned int i, j; unsigned int i, j;
int bit, k; int bit, k;
GString *xpm; struct l_string *xpm;
unsigned int pos = 0; unsigned int pos = 0;
const char xpm_header[] = "/* XPM */\n"; const char xpm_header[] = "/* XPM */\n";
const char declaration[] = "static char *xpm[] = {\n"; const char declaration[] = "static char *xpm[] = {\n";
@ -6470,22 +6470,20 @@ char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
* pixels - width * height * cpp + height deliminators "",\n * pixels - width * height * cpp + height deliminators "",\n
* end of assignment - 2 chars "};" * end of assignment - 2 chars "};"
*/ */
xpm = g_string_sized_new(strlen(xpm_header) + strlen(declaration) + xpm = l_string_new(strlen(xpm_header) + strlen(declaration) +
19 + ((cpp + 14) * ncolors) + 19 + ((cpp + 14) * ncolors) +
(width * height * cpp) + (4 * height) + 2); (width * height * cpp) + (4 * height) + 2);
if (xpm == NULL)
return NULL;
/* add header, declaration, values */ /* add header, declaration, values */
g_string_append(xpm, xpm_header); l_string_append(xpm, xpm_header);
g_string_append(xpm, declaration); l_string_append(xpm, declaration);
g_string_append_printf(xpm, "\"%d %d %d %d\",\n", width, height, l_string_append_printf(xpm, "\"%d %d %d %d\",\n", width, height,
ncolors, cpp); ncolors, cpp);
/* create colors */ /* create colors */
if (scheme == STK_IMG_SCHEME_BASIC) { if (scheme == STK_IMG_SCHEME_BASIC) {
g_string_append(xpm, "\"0\tc #000000\",\n"); l_string_append(xpm, "\"0\tc #000000\",\n");
g_string_append(xpm, "\"1\tc #FFFFFF\",\n"); l_string_append(xpm, "\"1\tc #FFFFFF\",\n");
} else { } else {
for (i = 0; i < ncolors; i++) { for (i = 0; i < ncolors; i++) {
/* lookup char representation of this number */ /* lookup char representation of this number */
@ -6500,10 +6498,10 @@ char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
if ((i == (ncolors - 1)) && if ((i == (ncolors - 1)) &&
scheme == STK_IMG_SCHEME_TRANSPARENCY) scheme == STK_IMG_SCHEME_TRANSPARENCY)
g_string_append_printf(xpm, l_string_append_printf(xpm,
"\"%s\tc None\",\n", c); "\"%s\tc None\",\n", c);
else else
g_string_append_printf(xpm, l_string_append_printf(xpm,
"\"%s\tc #%02hhX%02hhX%02hhX\",\n", "\"%s\tc #%02hhX%02hhX%02hhX\",\n",
c, clut[0], clut[1], clut[2]); c, clut[0], clut[1], clut[2]);
clut += 3; clut += 3;
@ -6513,7 +6511,7 @@ char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
/* height rows of width pixels */ /* height rows of width pixels */
k = 7; k = 7;
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
g_string_append(xpm, "\""); l_string_append(xpm, "\"");
for (j = 0; j < width; j++) { for (j = 0; j < width; j++) {
entry = 0; entry = 0;
for (bit = nbits - 1; bit >= 0; bit--) { for (bit = nbits - 1; bit >= 0; bit--) {
@ -6537,14 +6535,14 @@ char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
c[1] = '\0'; c[1] = '\0';
} }
g_string_append_printf(xpm, "%s", c); l_string_append_printf(xpm, "%s", c);
} }
g_string_append(xpm, "\",\n"); l_string_append(xpm, "\",\n");
} }
g_string_append(xpm, "};"); l_string_append(xpm, "};");
/* Caller must free char data */ /* Caller must free char data */
return g_string_free(xpm, FALSE); return l_string_unwrap(xpm);
} }