Merge branch 'master' of git.ucc.asn.au:/ipdf/code
authorSam Moore <matches@ucc.asn.au>
Sun, 6 Jul 2014 11:45:52 +0000 (19:45 +0800)
committerSam Moore <matches@ucc.asn.au>
Sun, 6 Jul 2014 11:45:52 +0000 (19:45 +0800)
Dammit I forgot to `git stash; git pull; git stash apply`

src/screen.cpp

index dc59de9..fdda252 100644 (file)
@@ -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);

UCC git Repository :: git.ucc.asn.au