mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

revert semantic patch change to framebuffer font tool

Browse Source
This commit is contained in:
Vincent Sanders 2017-09-07 16:47:45 +01:00
parent b9bdc279f2
commit 3faaf00ca3
1 changed files with 92 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
frontends/framebuffer/convert_font.c
View File

@ -278,8 +278,7 @@ bool generate_font_header(const char *path, struct font_data *data)
fp = fopen(path, "wb"); fp = fopen(path, "wb");
if (fp == NULL) { if (fp == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Couldn't open header file \"%s\"\n", path);
"Couldn't open header file \"%s\"\n", path);
return false; return false;
} }
@ -316,8 +315,7 @@ bool generate_font_source(const char *path, struct font_data *data)
fp = fopen(path, "wb"); fp = fopen(path, "wb");
if (fp == NULL) { if (fp == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Couldn't open output file \"%s\"\n", path);
"Couldn't open output file \"%s\"\n", path);
return false; return false;
} }
@ -415,14 +413,14 @@ static bool add_glyph_to_data(glyph_entry *add, int id, int style,
d->e[d->glyphs++] = e; d->e[d->glyphs++] = e;
e->index = d->glyphs; e->index = d->glyphs;
if (d->glyphs >= 0xfffd) { if (d->glyphs >= 0xfffd) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Too many glyphs for internal data "
" Too many glyphs for internal data ""representation\n"); "representation\n");
return false; return false;
} }
} else { } else {
/* Duplicate glyph */ /* Duplicate glyph */
NSLOG(netsurf, INFO, LOG_DEBUG, LOG(LOG_DEBUG, " U+%.4X (%s) is duplicate\n",
" U+%.4X (%s) is duplicate\n", id, short_labels[style]); id, short_labels[style]);
} }
/* Find glyph's section */ /* Find glyph's section */
@ -434,8 +432,8 @@ static bool add_glyph_to_data(glyph_entry *add, int id, int style,
size_t size = (d->sec_count[style] + 1) * SECTION_SIZE; size_t size = (d->sec_count[style] + 1) * SECTION_SIZE;
uint16_t *temp = realloc(d->sections[style], size); uint16_t *temp = realloc(d->sections[style], size);
if (temp == NULL) { if (temp == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Couldn't increase sections "
" Couldn't increase sections ""allocation\n"); "allocation\n");
return false; return false;
} }
memset(temp + d->sec_count[style] * 256, 0, memset(temp + d->sec_count[style] * 256, 0,
@ -458,50 +456,47 @@ static bool check_glyph_data_valid(int pos, char c)
if (pos == 44) { if (pos == 44) {
if (c != '\n') { if (c != '\n') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting '\\n', got '%c' (%i)\n", "expecting '\\n', got '%c' (%i)\n",
c, c, c);
c);
return false; return false;
} else { } else {
return true; return true;
} }
} else if (pos < 3) { } else if (pos < 3) {
if (c != ' ') { if (c != ' ') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting ' ', got '%c' (%i)\n", "expecting ' ', got '%c' (%i)\n",
c, c, c);
c);
return false; return false;
} else { } else {
return true; return true;
} }
} else if (offset == 0) { } else if (offset == 0) {
if (c != '\n' && c != ' ') { if (c != '\n' && c != ' ') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting '\\n' or ' ', ""got '%c' (%i)\n", "expecting '\\n' or ' ', "
c, "got '%c' (%i)\n",
c); c, c);
return false; return false;
} else { } else {
return true; return true;
} }
} else if (offset < 3) { } else if (offset < 3) {
if (c != ' ') { if (c != ' ') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting ' ', got '%c' (%i)\n", "expecting ' ', got '%c' (%i)\n",
c, c, c);
c);
return false; return false;
} else { } else {
return true; return true;
} }
} else if (offset >= 3 && pos < 11) { } else if (offset >= 3 && pos < 11) {
if (c != '.' && c != '#') { if (c != '.' && c != '#') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting '.' or '#', ""got '%c' (%i)\n", "expecting '.' or '#', "
c, "got '%c' (%i)\n",
c); c, c);
return false; return false;
} else { } else {
return true; return true;
@ -510,10 +505,10 @@ static bool check_glyph_data_valid(int pos, char c)
/* offset must be >=3 */ /* offset must be >=3 */
if (c != '.' && c != '#' && c != ' ') { if (c != '.' && c != '#' && c != ' ') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph data: "
" Invalid glyph data: ""expecting '.', '#', or ' ', ""got '%c' (%i)\n", "expecting '.', '#', or ' ', "
c, "got '%c' (%i)\n",
c); c, c);
return false; return false;
} }
@ -702,11 +697,11 @@ static bool parse_glyph_data(struct parse_context *ctx, char c,
/* Check that character is valid */ /* Check that character is valid */
if (check_glyph_data_valid(ctx->data.in_gd.pos, c) == false) { if (check_glyph_data_valid(ctx->data.in_gd.pos, c) == false) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Error in U+%.4X data: "
" Error in U+%.4X data: ""glyph line: %i, pos: %i\n", "glyph line: %i, pos: %i\n",
ctx->id, ctx->id,
ctx->data.in_gd.line, ctx->data.in_gd.line,
ctx->data.in_gd.pos); ctx->data.in_gd.pos);
goto error; goto error;
} }
@ -717,8 +712,8 @@ static bool parse_glyph_data(struct parse_context *ctx, char c,
ctx->data.in_gd.e[glyph] = ctx->data.in_gd.e[glyph] =
calloc(sizeof(struct glyph_entry), 1); calloc(sizeof(struct glyph_entry), 1);
if (ctx->data.in_gd.e[glyph] == NULL) { if (ctx->data.in_gd.e[glyph] == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Couldn't allocate memory for "
" Couldn't allocate memory for ""glyph entry\n"); "glyph entry\n");
goto error; goto error;
} }
@ -740,17 +735,18 @@ static bool parse_glyph_data(struct parse_context *ctx, char c,
if (c == '\n') { if (c == '\n') {
if (ctx->data.in_gd.line == 0) { if (ctx->data.in_gd.line == 0) {
if (ctx->data.in_gd.e[0] == NULL) { if (ctx->data.in_gd.e[0] == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Error in U+%.4X data: "
" Error in U+%.4X data: ""\"Regular\" glyph style must ""be present\n", "\"Regular\" glyph style must "
ctx->id); "be present\n", ctx->id);
goto error; goto error;
} }
} else if (ctx->data.in_gd.styles != } else if (ctx->data.in_gd.styles !=
ctx->data.in_gd.line_styles) { ctx->data.in_gd.line_styles) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Error in U+%.4X data: "
" Error in U+%.4X data: ""glyph line: %i ""styles don't match first line\n", "glyph line: %i "
ctx->id, "styles don't match first line\n",
ctx->data.in_gd.line); ctx->id,
ctx->data.in_gd.line);
goto error; goto error;
} }
@ -768,10 +764,10 @@ static bool parse_glyph_data(struct parse_context *ctx, char c,
ctx->count[i] += 1; ctx->count[i] += 1;
if (glyph_is_codepoint(ctx->data.in_gd.e[i], if (glyph_is_codepoint(ctx->data.in_gd.e[i],
ctx->id, i)) { ctx->id, i)) {
NSLOG(netsurf, INFO, LOG_DEBUG, LOG(LOG_DEBUG, " U+%.4X (%s) is "
" U+%.4X (%s) is ""codepoint\n", "codepoint\n",
ctx->id, ctx->id,
short_labels[i]); short_labels[i]);
ctx->codepoints += 1; ctx->codepoints += 1;
free(ctx->data.in_gd.e[i]); free(ctx->data.in_gd.e[i]);
ctx->data.in_gd.e[i] = NULL; ctx->data.in_gd.e[i] = NULL;
@ -814,8 +810,7 @@ static bool get_hex_digit_value(char c, int *v)
else if (c >= 'A' && c <= 'F') else if (c >= 'A' && c <= 'F')
*v = (10 + c - 'A'); *v = (10 + c - 'A');
else { else {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Invalid hex digit '%c' (%i)\n", c, c);
"Invalid hex digit '%c' (%i)\n", c, c);
return false; return false;
} }
@ -852,16 +847,14 @@ static bool parse_chunk(struct parse_context *ctx, const char *buf, size_t len,
while (pos < end) { while (pos < end) {
if (*pos == '\r') { if (*pos == '\r') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Detected \'\\r\': Bad line ending\n");
"Detected \'\\r\': Bad line ending\n");
return false; return false;
} }
switch (ctx->state) { switch (ctx->state) {
case START: case START:
if (*pos != '*') { if (*pos != '*') {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "First character must be '*'\n");
"First character must be '*'\n");
printf("Got: %c (%i)\n", *pos, *pos); printf("Got: %c (%i)\n", *pos, *pos);
return false; return false;
} }
@ -873,13 +866,12 @@ static bool parse_chunk(struct parse_context *ctx, const char *buf, size_t len,
case IN_HEADER: case IN_HEADER:
if (ctx->data.in_header.new_line == true) { if (ctx->data.in_header.new_line == true) {
if (*pos != '*') { if (*pos != '*') {
NSLOG(netsurf, INFO, LOG_INFO, LOG(LOG_INFO, " Got header "
" Got header ""(%i bytes)\n", "(%i bytes)\n",
d->header_len); d->header_len);
NSLOG(netsurf, INFO, LOG_DEBUG, LOG(LOG_DEBUG, " Header:\n\n%.*s\n",
" Header:\n\n%.*s\n", d->header_len,
d->header_len, d->header);
d->header);
ctx->data.before_id.new_line = false; ctx->data.before_id.new_line = false;
ctx->data.before_id.u = false; ctx->data.before_id.u = false;
ctx->state = BEFORE_ID; ctx->state = BEFORE_ID;
@ -894,9 +886,9 @@ static bool parse_chunk(struct parse_context *ctx, const char *buf, size_t len,
} }
if (d->header_len == HEADER_MAX) { if (d->header_len == HEADER_MAX) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Header too long "
" Header too long ""(>%i bytes)\n", "(>%i bytes)\n",
d->header_len); d->header_len);
return false; return false;
} }
@ -930,8 +922,7 @@ static bool parse_chunk(struct parse_context *ctx, const char *buf, size_t len,
ok = assemble_codepoint(pos, ctx->data.g_id.c++, ok = assemble_codepoint(pos, ctx->data.g_id.c++,
&ctx->id); &ctx->id);
if (!ok) { if (!ok) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, " Invalid glyph ID\n");
" Invalid glyph ID\n");
return false; return false;
} }
@ -1003,8 +994,8 @@ static bool parse_chunk(struct parse_context *ctx, const char *buf, size_t len,
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
NSLOG(netsurf, INFO, LOG_DEBUG, " %s: %i gylphs\n", LOG(LOG_DEBUG, " %s: %i gylphs\n", labels[i],
labels[i], ctx->count[i] - count[i]); ctx->count[i] - count[i]);
} }
return true; return true;
@ -1028,15 +1019,13 @@ bool load_font(const char *path, struct font_data **data)
fp = fopen(path, "rb"); fp = fopen(path, "rb");
if (fp == NULL) { if (fp == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Couldn't open font data file\n");
"Couldn't open font data file\n");
return false; return false;
} }
d = calloc(sizeof(struct font_data), 1); d = calloc(sizeof(struct font_data), 1);
if (d == NULL) { if (d == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Couldn't allocate memory for font data\n");
"Couldn't allocate memory for font data\n");
fclose(fp); fclose(fp);
return false; return false;
} }
@ -1045,19 +1034,18 @@ bool load_font(const char *path, struct font_data **data)
fseek(fp, 0L, SEEK_END); fseek(fp, 0L, SEEK_END);
file_len = ftell(fp); file_len = ftell(fp);
if (file_len == -1) { if (file_len == -1) {
NSLOG(netsurf, INFO, LOG_ERROR, "Could not size input file\n"); LOG(LOG_ERROR, "Could not size input file\n");
free(d); free(d);
fclose(fp); fclose(fp);
return false; return false;
} }
fseek(fp, 0L, SEEK_SET); fseek(fp, 0L, SEEK_SET);
NSLOG(netsurf, INFO, LOG_DEBUG, "Input size: %zu bytes\n", file_len); LOG(LOG_DEBUG, "Input size: %zu bytes\n", file_len);
/* Allocate buffer for data chunks */ /* Allocate buffer for data chunks */
buf = malloc(CHUNK_SIZE); buf = malloc(CHUNK_SIZE);
if (buf == NULL) { if (buf == NULL) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Couldn't allocate memory for input buffer\n");
"Couldn't allocate memory for input buffer\n");
free(d); free(d);
fclose(fp); fclose(fp);
return false; return false;
@ -1066,24 +1054,20 @@ bool load_font(const char *path, struct font_data **data)
/* Initialise parser */ /* Initialise parser */
parse_init(&ctx); parse_init(&ctx);
NSLOG(netsurf, INFO, LOG_DEBUG, "Using chunk size of %i bytes\n", LOG(LOG_DEBUG, "Using chunk size of %i bytes\n", CHUNK_SIZE);
CHUNK_SIZE);
/* Parse the input file in chunks */ /* Parse the input file in chunks */
for (done = 0; done < file_len; done += CHUNK_SIZE) { for (done = 0; done < file_len; done += CHUNK_SIZE) {
NSLOG(netsurf, INFO, LOG_INFO, "Parsing input chunk %zu\n", LOG(LOG_INFO, "Parsing input chunk %zu\n", done / CHUNK_SIZE);
done / CHUNK_SIZE);
/* Read chunk */ /* Read chunk */
len = fread(buf, 1, CHUNK_SIZE, fp); len = fread(buf, 1, CHUNK_SIZE, fp);
if (file_len - done < CHUNK_SIZE && if (file_len - done < CHUNK_SIZE &&
len != file_len - done) { len != file_len - done) {
NSLOG(netsurf, INFO, LOG_WARNING, LOG(LOG_WARNING, "Last chunk has suspicious size\n");
"Last chunk has suspicious size\n");
} else if (file_len - done >= CHUNK_SIZE && } else if (file_len - done >= CHUNK_SIZE &&
len != CHUNK_SIZE) { len != CHUNK_SIZE) {
NSLOG(netsurf, INFO, LOG_ERROR, LOG(LOG_ERROR, "Problem reading file\n");
"Problem reading file\n");
free(buf); free(buf);
free(d); free(d);
fclose(fp); fclose(fp);
@ -1098,33 +1082,29 @@ bool load_font(const char *path, struct font_data **data)
fclose(fp); fclose(fp);
return false; return false;
} }
NSLOG(netsurf, INFO, LOG_DEBUG, "Parsed %zu bytes\n", LOG(LOG_DEBUG, "Parsed %zu bytes\n", done + len);
done + len);
} }
fclose(fp); fclose(fp);
if (ctx.state != BEFORE_ID) { if (ctx.state != BEFORE_ID) {
NSLOG(netsurf, INFO, LOG_ERROR, "Unexpected end of file\n"); LOG(LOG_ERROR, "Unexpected end of file\n");
free(buf); free(buf);
free(d); free(d);
return false; return false;
} }
NSLOG(netsurf, INFO, LOG_INFO, "Parsing complete:\n"); LOG(LOG_INFO, "Parsing complete:\n");
count = 0; count = 0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
NSLOG(netsurf, INFO, LOG_INFO, " %s: %i gylphs\n", LOG(LOG_INFO, " %s: %i gylphs\n", labels[i], ctx.count[i]);
labels[i], ctx.count[i]);
count += ctx.count[i]; count += ctx.count[i];
} }
NSLOG(netsurf, INFO, LOG_RESULT, LOG(LOG_RESULT, " Total %i gylphs "
" Total %i gylphs ""(of which %i unique, %i codepoints, %i duplicates)\n", "(of which %i unique, %i codepoints, %i duplicates)\n",
count, count, d->glyphs, ctx.codepoints,
d->glyphs, count - d->glyphs - ctx.codepoints);
ctx.codepoints,
count - d->glyphs - ctx.codepoints);
free(buf); free(buf);
@ -1135,9 +1115,16 @@ bool load_font(const char *path, struct font_data **data)
static void log_usage(const char *argv0) static void log_usage(const char *argv0)
{ {
level = LOG_INFO; level = LOG_INFO;
NSLOG(netsurf, INFO, LOG_INFO, LOG(LOG_INFO,
"Usage:\n""\t%s [options] <in_file> <out_file>\n""\n""Options:\n""\t--help -h Display this text\n""\t--quiet -q Don't show warnings\n""\t--verbose -v Verbose output\n""\t--debug -d Full debug output\n", "Usage:\n"
argv0); "\t%s [options] <in_file> <out_file>\n"
"\n"
"Options:\n"
"\t--help -h Display this text\n"
"\t--quiet -q Don't show warnings\n"
"\t--verbose -v Verbose output\n"
"\t--debug -d Full debug output\n",
argv0);
} }
int main(int argc, char** argv) int main(int argc, char** argv)
@ -1200,9 +1187,8 @@ int main(int argc, char** argv)
in_path = argv[optind]; in_path = argv[optind];
out_path = argv[optind + 1]; out_path = argv[optind + 1];
NSLOG(netsurf, INFO, LOG_DEBUG, "Using input path: \"%s\"\n", in_path); LOG(LOG_DEBUG, "Using input path: \"%s\"\n", in_path);
NSLOG(netsurf, INFO, LOG_DEBUG, "Using output path: \"%s\"\n", LOG(LOG_DEBUG, "Using output path: \"%s\"\n", out_path);
out_path);
ok = load_font(in_path, &data); ok = load_font(in_path, &data);
if (!ok) { if (!ok) {