extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2024-12-04 22:11:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix vertical shape detection with open sides

Browse Source
This commit is contained in:
Thomas Jensen 2023-12-17 14:14:32 +01:00
parent 0fe0362926
commit dd82c33888
No known key found for this signature in database
GPG Key ID: A4ACEE270D0FB7DB
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/remove.c
View File

@ -772,9 +772,18 @@ static int sufficient_body_quality(remove_ctx_t *ctx)
total_quality += line_ctx.east_quality + line_ctx.west_quality; total_quality += line_ctx.east_quality + line_ctx.west_quality;
} }
size_t max_quality = (opt.design->shape[NW].width + opt.design->shape[NE].width) * num_body_lines; size_t max_quality = 0;
if (!ctx->empty_side[BLEF]) {
max_quality += opt.design->shape[NW].width;
}
if (!ctx->empty_side[BRIG]) {
max_quality += opt.design->shape[NE].width;
}
max_quality = max_quality * num_body_lines;
/* If we manage to match 50%, then it is unlikely to improve with a different comparison mode. */ /* If we manage to match 50%, then it is unlikely to improve with a different comparison mode. */
int sufficient = total_quality > 0.5 * max_quality; int sufficient = (max_quality == 0 && total_quality == 0)
|| (max_quality > 0 && (total_quality > 0.5 * max_quality));
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "sufficient_body_quality() found body match quality of %d/%d (%s).\n", fprintf(stderr, "sufficient_body_quality() found body match quality of %d/%d (%s).\n",
(int) total_quality, (int) max_quality, sufficient ? "sufficient" : "NOT sufficient"); (int) total_quality, (int) max_quality, sufficient ? "sufficient" : "NOT sufficient");
@ -809,6 +818,10 @@ static void find_vertical_shapes(remove_ctx_t *ctx)
continue; continue;
} }
ctx->comp_type = comp_type; ctx->comp_type = comp_type;
#ifdef DEBUG
fprintf(stderr, "find_vertical_shapes(): comp_type = %s\n", comparison_name[comp_type]);
#endif
reset_body(ctx);
shape_line_ctx_t **shape_lines_west = NULL; shape_line_ctx_t **shape_lines_west = NULL;
if (!west_empty) { if (!west_empty) {
@ -841,7 +854,6 @@ static void find_vertical_shapes(remove_ctx_t *ctx)
if (sufficient_body_quality(ctx)) { if (sufficient_body_quality(ctx)) {
break; break;
} }
reset_body(ctx);
} }
} }