Changeset 687 for branches

Timestamp:

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

Author:

dom

Message:

revert [681] - breaks text labels

Location:

branches/stable/0.5

Files:

• include/mapnik/color.hpp (modified) (2 diffs)
• src/wkb.cpp (modified) (2 diffs)
• tinyxml/tinyxmlparser.cpp (modified) (1 diff)

branches/stable/0.5/include/mapnik/color.hpp

@@ -41 +41 @@
 
         Color(int red,int green,int blue,int alpha=0xff)
-            : abgr_(((alpha&0xff) << 24 | 
-                     (blue&0xff)) << 16 | 
-                     ((green&0xff) << 8 | 
-                     (red&0xff))) {}
+            : abgr_((alpha&0xff) << 24 | 
+                    (blue&0xff) << 16  | 
+                    (green&0xff) << 8  | 
+                    red&0xff) {}
         
         explicit Color(int rgba)
@@ -89 +89 @@
         inline void set_alpha(unsigned int a)
         {
-            abgr_ = (abgr_ & 0x00ffffff) | ((a&0xff) << 24);
+            abgr_ = (abgr_ & 0x00ffffff | (a&0xff) << 24);
         }
 

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);
             }

branches/stable/0.5/tinyxml/tinyxmlparser.cpp

@@ -355 +355 @@
         else
         {
-          while ((*p && IsWhiteSpace( *p )) || *p == '\n' || *p =='\r' )
+                while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
                         ++p;
         }