From: Sam Moore <matches@ucc.asn.au>
Date: Sun, 6 Jul 2014 11:45:52 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:/ipdf/code
X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=commitdiff_plain;h=e297312c8c82e52abd3507c861e85db497ca7e81;hp=a182cbba4fe9e6a36c5063735dbec1c5340da04c

Merge branch 'master' of git.ucc.asn.au:/ipdf/code

Dammit I forgot to `git stash; git pull; git stash apply`
---

diff --git a/src/screen.cpp b/src/screen.cpp
index dc59de9..fdda252 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -378,7 +378,7 @@ void Screen::DebugFontInit(const char *name, float font_size)
 	size_t font_file_size = ftell(font_file);
 	fseek(font_file, 0, SEEK_SET);
 	unsigned char *font_file_data = (unsigned char*)malloc(font_file_size);
-	fread(font_file_data, 1, font_file_size, font_file);
+	SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
 	fclose(font_file);
 	stbtt_BakeFontBitmap(font_file_data,0, font_size, font_atlas_data,1024,1024, 32,96, m_debug_font_rects);
 	free(font_file_data);