Changeset 1205 for trunk/plugins/input/shape/shapefile.hpp

Timestamp:

07/03/09 09:29:50 (13 months ago)

Author:

artem

Message:

+ move byte order depended I/O to global.hpp

this should fix shape.input PPC issues

Files:

• trunk/plugins/input/shape/shapefile.hpp (modified) (2 diffs)

trunk/plugins/input/shape/shapefile.hpp

@@ -26 +26 @@
 #define SHAPEFILE_HPP
 
+#include <mapnik/global.hpp>
 #include <mapnik/envelope.hpp>
 // boost
 #include <boost/utility.hpp>
-#include <boost/detail/endian.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/iostreams/stream.hpp>
+
 #include <boost/iostreams/device/file.hpp>
 #include <boost/iostreams/device/mapped_file.hpp>
+//#include <boost/iostreams/device/file_descriptor.hpp>
 
 #include <cstring>
 
 using mapnik::Envelope;
+using mapnik::read_int_ndr;
+using mapnik::read_int_xdr;
+using mapnik::read_double_ndr;
+using mapnik::read_double_xdr;
 
 struct shape_record
 {
-      const char* data;
-      size_t size;
-      mutable size_t pos;
-      explicit shape_record(size_t size)
-         : size(size),
-           pos(0) {} 
+    const char* data;
+    size_t size;
+    mutable size_t pos;
+    explicit shape_record(size_t size)
+        : //data(static_cast<char*>(::operator new(sizeof(char)*size))),
+        size(size),
+        pos(0) {} 
       
-      void set_data(const char * data_)
-      {
-         data = data_;
-      }
+    void set_data(const char * data_)
+    {
+        data = data_;
+    }
+  
+    void skip(unsigned n)
+    {
+        pos+=n;
+    }
       
-      void skip(unsigned n)
-      {
-         pos+=n;
-      }
+    int read_ndr_integer()
+    {
+        int val;
+        read_int_ndr(&data[pos],val);
+        pos+=4;
+        return val;
+    }
       
-      int read_ndr_integer()
-      {
-         int val=(data[pos] & 0xff)     | 
-            (data[pos+1] & 0xff) << 8  |
-            (data[pos+2] & 0xff) << 16 |
-            (data[pos+3] & 0xff) << 24;
-         pos+=4;
-         return val;
-      }
+    int read_xdr_integer()
+    {
+        int val;
+        read_int_xdr(&data[pos],val);
+        pos+=4;
+        return val;
+    }
       
-      int read_xdr_integer()
-      {
-         int val=(data[pos] & 0xff) << 24 | 
-            (data[pos+1] & 0xff)   << 16   |
-            (data[pos+2] & 0xff)   << 8    |
-            (data[pos+3] & 0xff);
-         pos+=4;
-         return val;
-      }
-      
-      double read_double()
-      {
-         double val;            
-#ifndef BOOST_BIG_ENDIAN
-         std::memcpy(&val,&data[pos],8);        
-#else
-         long long bits = ((long long)data[pos] & 0xff) | 
-            ((long long)data[pos+1] & 0xff) << 8   |
-            ((long long)data[pos+2] & 0xff) << 16  |
-            ((long long)data[pos+3] & 0xff) << 24  |
-            ((long long)data[pos+4] & 0xff) << 32  |
-            ((long long)data[pos+5] & 0xff) << 40  |
-            ((long long)data[pos+6] & 0xff) << 48  |
-            ((long long)data[pos+7] & 0xff) << 56  ;
-         std::memcpy(&val,&bits,8);
-#endif 
-         pos+=8;
-         return val;
-      }
-      long remains() 
-      {
-         return (size-pos);
-      }
-      ~shape_record() {}
+    double read_double()
+    {
+        double val;             
+        read_double_ndr(&data[pos],val);
+        pos+=8;
+        return val;
+    }
+    long remains() 
+    {
+        return (size-pos);
+    }
+  
+    ~shape_record() 
+    {
+        //::operator delete(data);
+    }
  
 };
@@ -108 +104 @@
 class shape_file : boost::noncopyable
 {  
-      stream<mapped_file_source> file_;
-   public:
-      shape_file();
-      shape_file(const std::string& file_name);
-      ~shape_file();
-      bool is_open();
-      void close();
+    stream<mapped_file_source> file_;
+    //stream<file_source> file_;
+public:
+    shape_file();
+    shape_file(std::string const& file_name);
+    ~shape_file();
+    bool is_open();
+    void close();
       
-      inline void read_record(shape_record& rec)
-      {
-         rec.set_data(file_->data() + file_.tellg());
-         file_.seekg(rec.size,std::ios::cur);
-      }
+    inline void read_record(shape_record& rec)
+    {
+        rec.set_data(file_->data() + file_.tellg());
+        file_.seekg(rec.size,std::ios::cur);
+    }
+    
+    inline int read_xdr_integer()
+    {
+        char b[4];
+        file_.read(b, 4);
+        int val;
+        read_int_xdr(b,val);
+        return val;
+    }
       
-      inline int read_xdr_integer()
-      {
-         char b[4];
-         file_.read(b, 4);
-         return (b[3] & 0xffu) | ((b[2] & 0xffu) << 8) |
-            ((b[1] & 0xffu) << 16) | ((b[0] & 0xffu) << 24);
-      }
+    inline int read_ndr_integer()
+    {
+        char b[4];
+        file_.read(b,4);
+        int val;
+        read_int_ndr(b,val);
+        return val;
+    }
       
-      inline int read_ndr_integer()
-      {
-         char b[4];
-         file_.read(b,4);
-         return (b[0]&0xffu) | ((b[1]&0xffu) << 8) | 
-            ((b[2]&0xffu) << 16) | ((b[3]&0xffu) << 24);
-      }
+    inline double read_double()
+    {
+        double val;
+#ifndef WORDS_BIGENDIAN
+        file_.read(reinterpret_cast<char*>(&val),8);
+#else
+        char b[8];
+        file_.read(b,8);
+        read_double_ndr(b,val);
+#endif
+        return val;
+    }
+    
+    inline void read_envelope(Envelope<double>& envelope)
+    {
+#ifndef WORDS_BIGENDIAN
+        file_.read(reinterpret_cast<char*>(&envelope),sizeof(envelope));
+#else
+        char data[4*8];
+        file_.read(data,4*8);
+        double minx,miny,maxx,maxy;
+        read_double_ndr(data,minx);
+        read_double_ndr(data,miny);
+        read_double_ndr(data,maxx);
+        read_double_ndr(data,maxy);
+        envelope.init(minx,miny,maxx,maxy);
+#endif  
+    }
       
-      inline double read_double()
-      {
-         double val;
-#ifndef WORDS_BIGENDIAN
-         file_.read(reinterpret_cast<char*>(&val),8);
-#else
-         char b[8];
-         file_.read(b,8);
-         long long bits = ((long long)b[0] & 0xff) | 
-            ((long long)b[1] & 0xff) << 8   |
-            ((long long)b[2] & 0xff) << 16  |
-            ((long long)b[3] & 0xff) << 24  |
-            ((long long)b[4] & 0xff) << 32  |
-            ((long long)b[5] & 0xff) << 40  |
-            ((long long)b[6] & 0xff) << 48  |
-            ((long long)b[7] & 0xff) << 56  ;
-         memcpy(&val,&bits,8);
-#endif
-         return val;
-      }
+    inline void skip(std::streampos bytes)
+    {
+        file_.seekg(bytes,std::ios::cur);
+    }
       
-      inline void read_envelope(Envelope<double>& envelope)
-      {
-#ifndef WORDS_BIGENDIAN
-         file_.read(reinterpret_cast<char*>(&envelope),sizeof(envelope));
-#else
-         double minx=read_double();
-         double miny=read_double();
-         double maxx=read_double();
-         double maxy=read_double();
-         envelope.init(minx,miny,maxx,maxy);
-#endif  
-      }
+    inline void rewind()
+    {
+        seek(100);
+    }
       
-      inline void skip(std::streampos bytes)
-      {
-         file_.seekg(bytes,std::ios::cur);
-      }
+    inline void seek(std::streampos pos)
+    {
+        file_.seekg(pos,std::ios::beg);
+    }
       
-      inline void rewind()
-      {
-         seek(100);
-      }
+    inline std::streampos pos()
+    {
+        return file_.tellg();
+    }
       
-      inline void seek(std::streampos pos)
-      {
-         file_.seekg(pos,std::ios::beg);
-      }
-      
-      inline std::streampos pos()
-      {
-         return file_.tellg();
-      }
-      
-      inline bool is_eof()
-      {
-         return file_.eof();
-      }
+    inline bool is_eof()
+    {
+        return file_.eof();
+    }
 };