From f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Wed, 5 Feb 2003 07:59:09 +0000 Subject: - Changes for compiling with gcc 3.2 --- lib/psibitmap.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/psibitmap.cpp') diff --git a/lib/psibitmap.cpp b/lib/psibitmap.cpp index ffe97ea..3dfd125 100644 --- a/lib/psibitmap.cpp +++ b/lib/psibitmap.cpp @@ -142,17 +142,17 @@ do { \ bool decodeBitmap(const unsigned char *p, int &width, int &height, bufferStore &out) { - u_int32_t totlen = *((u_int32_t*)p); p += 4; - u_int32_t hdrlen = *((u_int32_t*)p); p += 4; + u_int32_t totlen = *((const u_int32_t*)p); p += 4; + u_int32_t hdrlen = *((const u_int32_t*)p); p += 4; u_int32_t datlen = totlen - hdrlen; - u_int32_t xPixels = *((u_int32_t*)p); p += 4; - u_int32_t yPixels = *((u_int32_t*)p); p += 4; - u_int32_t xTwips = *((u_int32_t*)p); p += 4; - u_int32_t yTwips = *((u_int32_t*)p); p += 4; - u_int32_t bitsPerPixel = *((u_int32_t*)p); p += 4; - u_int32_t unknown1 = *((u_int32_t*)p); p += 4; - u_int32_t unknown2 = *((u_int32_t*)p); p += 4; - u_int32_t RLEflag = *((u_int32_t*)p); p += 4; + u_int32_t xPixels = *((const u_int32_t*)p); p += 4; + u_int32_t yPixels = *((const u_int32_t*)p); p += 4; + u_int32_t xTwips = *((const u_int32_t*)p); p += 4; + u_int32_t yTwips = *((const u_int32_t*)p); p += 4; + u_int32_t bitsPerPixel = *((const u_int32_t*)p); p += 4; + u_int32_t unknown1 = *((const u_int32_t*)p); p += 4; + u_int32_t unknown2 = *((const u_int32_t*)p); p += 4; + u_int32_t RLEflag = *((const u_int32_t*)p); p += 4; width = xPixels; height = yPixels; -- cgit v1.2.3