m/ptouch-print
1
0
Fork 0
mirror of https://git.familie-radermacher.ch/linux/ptouch-print.git synced 2026-04-08 11:42:20 +00:00
Code Issues Releases Activity

find_fontsize: always account for common ascenders and descenders

Browse Source
This commit is contained in:
Pascal de Bruijn
2026-03-05 17:32:29 +01:00
committed by Dominic Radermacher
parent 2d4ffd6112
commit c08a456bfd
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ptouch-print.c
View File

@@ -298,11 +298,22 @@ int get_baselineoffset(char *text, char *font, int fsz)
-------------------------------------------------------------------- */ -------------------------------------------------------------------- */
int find_fontsize(int want_px, char *font, char *text) int find_fontsize(int want_px, char *font, char *text)
{ {
// stabilize font size determination by always accounting for common ascenders and descenders
const char *common_chars = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnoprqstuvwxyz{|}~";
char *combined_text = (char *)malloc(strlen(text) + strlen(common_chars) + 1);
if (!combined_text) {
fprintf(stderr, "Memory allocation failed\n");
return -1;
}
strcpy(combined_text, text);
strcat(combined_text, common_chars);
int save = 0; int save = 0;
int brect[8]; int brect[8];
for (int i=4; ; ++i) { for (int i=4; ; ++i) {
if (gdImageStringFT(NULL, &brect[0], -1, font, i, 0.0, 0, 0, text) != NULL) { if (gdImageStringFT(NULL, &brect[0], -1, font, i, 0.0, 0, 0, combined_text) != NULL) {
break; break;
} }
if (brect[1]-brect[5] <= want_px) { if (brect[1]-brect[5] <= want_px) {
@@ -311,6 +322,9 @@ int find_fontsize(int want_px, char *font, char *text)
break; break;
} }
} }
free(combined_text);
if (save == 0) { if (save == 0) {
return -1; return -1;
} }