summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2008-01-08 15:34:34 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2008-01-08 15:34:34 (GMT)
commitbeaed58ebc3108ecbbeac72d52a11fe3707748c8 (patch)
tree61d7b3e534889a0c39a56cbbeeab5d414631aadd
parentf4183dfb298b22f21cd553e0856d7270ebfae451 (diff)
download2iv35-beaed58ebc3108ecbbeac72d52a11fe3707748c8.zip
2iv35-beaed58ebc3108ecbbeac72d52a11fe3707748c8.tar.gz
2iv35-beaed58ebc3108ecbbeac72d52a11fe3707748c8.tar.bz2
get filesize from bitmap itself, duh
-rw-r--r--Smoke/renderer_gl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 0e88c5a..73454eb 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -45,6 +45,7 @@
#define LEGEND_Z_POS -735.0f
#define BITMAP_SOURCE "arrow.bmp"
+#define BITMAP_FILESIZE 0x02
#define BITMAP_OFFSET 0x0a
#define BITMAP_HEADERSIZE 0x0e
#define BITMAP_WIDTH 0x12
@@ -290,13 +291,12 @@ GLuint LoadTextures(char *filename)
bitmap = fopen(filename, "rb");
if (bitmap) {
- size_t filesize;
- unsigned int dataoffset;
+ unsigned int dataoffset, filesize;
GLsizei width, height;
unsigned char *imagedata;
- fseek(bitmap, 0, SEEK_END);
- filesize = ftell(bitmap);
+ fseek(bitmap, BITMAP_FILESIZE, SEEK_SET);
+ fread(&filesize, 4, 1, bitmap);
fseek(bitmap, BITMAP_OFFSET, SEEK_SET);
fread(&dataoffset, 4, 1, bitmap);
/* fseek(bitmap, BITMAP_HEADERSIZE, SEEK_SET); */