From 6627586d6e9259a82d0eb39f57cfd6f88c563358 Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Thu, 30 Jan 2020 17:31:37 +0800 Subject: [PATCH] Fix pedantic compiler test --- kitty/graphics.c | 3 ++- kitty/state.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kitty/graphics.c b/kitty/graphics.c index a0789e384..513c0fce7 100644 --- a/kitty/graphics.c +++ b/kitty/graphics.c @@ -263,7 +263,8 @@ bool png_path_to_bitmap(uint8_t** data, unsigned int* width, unsigned int* heigh size_t filesize = ftell(fp); *data = calloc(filesize, sizeof(char)); fseek(fp, 0L, SEEK_SET); // rewind() deprecated on some platforms - fread(*data, sizeof(char), filesize, fp); + size_t r = fread(*data, sizeof(char), filesize, fp); + if (r != filesize) return false; fclose(fp); png_read_data d; memset(&d, 0, sizeof(png_read_data)); diff --git a/kitty/state.c b/kitty/state.c index 3f1522624..1793510d1 100644 --- a/kitty/state.c +++ b/kitty/state.c @@ -96,12 +96,13 @@ add_os_window() { bgimage->texture_id = 0; RepeatStrategy r; switch (OPT(background_image_layout)) { - case TILING: - r = REPEAT_DEFAULT; break; case SCALED: r = REPEAT_CLAMP; break; case MIRRORED: - r = REPEAT_MIRROR; + r = REPEAT_MIRROR; break; + case TILING: + default: + r = REPEAT_DEFAULT; break; } send_image_to_gpu(&bgimage->texture_id, bgimage->bitmap, bgimage->width, bgimage->height, false, true, false, r);