root/pbsplash
1
0
Fork 0
mirror of https://git.sr.ht/~calebccff/pbsplash synced 2026-01-12 20:48:40 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

last few cleanups

Browse source
This commit is contained in:
Caleb Connolly 2023-02-20 02:31:55 +00:00
parent 3c96de11dd
commit 706888caf4
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pbsplash.c
View file

@ -220,13 +220,7 @@ static void calculate_dpi_info(struct dpi_info *dpi_info)
int h_mm = tfb_screen_height_mm(); int h_mm = tfb_screen_height_mm();
if ((w_mm < 1 || h_mm < 1) && !dpi_info->dpi) { if ((w_mm < 1 || h_mm < 1) && !dpi_info->dpi) {
FILE *fp = fopen("/dev/kmsg", "w"); fprintf(stderr, "ERROR!!!: Invalid screen size: %dx%d\n", w_mm, h_mm);
if (fp != NULL) {
fprintf(fp, "PBSPLASH: Invalid screen size: %dx%d\n",
w_mm, h_mm);
fclose(fp);
}
fprintf(stderr, "Invalid screen size: %dx%d\n", w_mm, h_mm);
// Assume a dpi of 300 // Assume a dpi of 300
// This should be readable everywhere // This should be readable everywhere
@ -263,7 +257,7 @@ static void calculate_dpi_info(struct dpi_info *dpi_info)
} }
} }
LOG("%dx%d @ %dx%dmm, dpi=%ld, logo_size_px=%f\n", screenWidth, printf("%dx%d @ %dx%dmm, dpi=%ld, logo_size_px=%f\n", screenWidth,
screenHeight, w_mm, h_mm, dpi_info->dpi, dpi_info->logo_size_px); screenHeight, w_mm, h_mm, dpi_info->dpi, dpi_info->logo_size_px);
} }
@ -378,7 +372,7 @@ static int load_image(const struct dpi_info *dpi_info, struct image_info *image_
if (image_info->width > (dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli)) { if (image_info->width > (dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli)) {
float scalefactor = float scalefactor =
((float)(dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli) / image_info->width); ((float)(dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli) / image_info->width);
printf("Got scale factor: %f\n", scalefactor); //printf("Got scale factor: %f\n", scalefactor);
image_info->width = dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli; image_info->width = dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli;
image_info->height *= scalefactor; image_info->height *= scalefactor;
} }
@ -475,7 +469,7 @@ int main(int argc, char **argv)
break; break;
case 'd': case 'd':
dpi_info.dpi = strtol(optarg, &end, 10); dpi_info.dpi = strtol(optarg, &end, 10);
if (end == optarg) { if (end == optarg || dpi_info.dpi < 0) {
fprintf(stderr, "Invalid dpi: %s\n", optarg); fprintf(stderr, "Invalid dpi: %s\n", optarg);
return usage(); return usage();
} }