aboutsummaryrefslogtreecommitdiffstats
path: root/lib/psibitmap.cpp
diff options
context:
space:
mode:
authorFritz Elfert <felfert@to.com>2003-02-05 07:59:09 +0000
committerFritz Elfert <felfert@to.com>2003-02-05 07:59:09 +0000
commitf0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85 (patch)
tree166bf2df5ca4fc40904af30a56a0de88683baf8d /lib/psibitmap.cpp
parent27ba222abbf3137eef49e31ac521de01d39c8088 (diff)
downloadplptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.gz
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.bz2
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.zip
- Changes for compiling with gcc 3.2
Diffstat (limited to 'lib/psibitmap.cpp')
-rw-r--r--lib/psibitmap.cpp20
1 files changed, 10 insertions, 10 deletions
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;