Changeset 687 for branches/stable/0.5/src/wkb.cpp

Timestamp:

04/05/08 17:53:25 (9 months ago)

Author:

dom

Message:

revert [681] - breaks text labels

Files:

• branches/stable/0.5/src/wkb.cpp (modified) (2 diffs)

branches/stable/0.5/src/wkb.cpp

@@ -146 +146 @@
             {
                const char* b=wkb_+pos_;
-               n = (((b[3]&0xff) | 
-                     (b[2]&0xff)) << 8 | 
-                    ((b[1]&0xff) << 16 | 
-                     (b[0]&0xff)) << 24);
+               n = b[3]&0xff | (b[2]&0xff)<<8 | (b[1]&0xff)<<16 | (b[0]&0xff)<<24;
             }
             pos_+=4;
@@ -170 +167 @@
                // this is not quite portable
                const char* b= wkb_+pos_;
-               long long n = (((long long)b[7]&0xff) | 
-                              ((long long)b[6]&0xff)<<8 | 
-                              ((long long)b[5]&0xff)<<16 | 
-                              ((long long)b[4]&0xff)<<24 |
-                              ((long long)b[3]&0xff)<<32 |
-                              ((long long)b[2]&0xff)<<40 |
-                              ((long long)b[1]&0xff)<<48 |
-                              ((long long)b[0]&0xff)<<56);
+               long long n = (long long)b[7]&0xff | 
+                  ((long long)b[6]&0xff)<<8 | 
+                  ((long long)b[5]&0xff)<<16 | 
+                  ((long long)b[4]&0xff)<<24 |
+                  ((long long)b[3]&0xff)<<32 |
+                  ((long long)b[2]&0xff)<<40 |
+                  ((long long)b[1]&0xff)<<48 |
+                  ((long long)b[0]&0xff)<<56;
                memcpy(&d,&n,8);
             }