topmod-svn/64bit.patch

   1 diff -ur topmodx_original/include/dlflcore/DLFLCommon.hh topmodx/include/dlflcore/DLFLCommon.hh
   2 --- topmodx_original/include/dlflcore/DLFLCommon.hh     2008-04-10 15:22:15.000000000 +0100
   3 +++ topmodx/include/dlflcore/DLFLCommon.hh      2008-04-10 19:35:02.000000000 +0100
   4 @@ -238,7 +238,7 @@
   5    };
   6
   7    typedef __gnu_cxx::hash<unsigned int> Hash;
   8 -  typedef __gnu_cxx::hash_map<unsigned int, unsigned int, Hash, eqstr> HashMap;
   9 +  typedef __gnu_cxx::hash_map<unsigned long, unsigned long, Hash, eqstr> HashMap;
  10
  11  } // end namespace
  12
  13 diff -ur topmodx_original/include/dlflcore/DLFLFaceVertex.hh topmodx/include/dlflcore/DLFLFaceVertex.hh
  14 --- topmodx_original/include/dlflcore/DLFLFaceVertex.hh 2008-04-10 15:22:15.000000000 +0100
  15 +++ topmodx/include/dlflcore/DLFLFaceVertex.hh  2008-04-10 19:35:02.000000000 +0100
  16 @@ -94,7 +94,7 @@
  17      void assignID( ) {
  18        // uID = DLFLFaceVertex::newID();
  19                         //std::cout << this;
  20 -                       uID = (unsigned int) this;
  21 +                       uID = (unsigned long) this;
  22                         //std::cout << "->" << uID << std::endl;
  23      };
  24
  25 diff -ur topmodx_original/include/dlflcore/DLFLObject.hh topmodx/include/dlflcore/DLFLObject.hh
  26 --- topmodx_original/include/dlflcore/DLFLObject.hh     2008-04-10 15:22:15.000000000 +0100
  27 +++ topmodx/include/dlflcore/DLFLObject.hh      2008-04-10 19:35:02.000000000 +0100
  28 @@ -359,7 +359,7 @@
  29      while ( efirst != elast ) {
  30                         edgeMap.erase((*efirst)->getID());
  31        (*efirst)->makeUnique();
  32 -                       edgeMap[(*efirst)->getID()] = (unsigned int)(*efirst);
  33 +                       edgeMap[(*efirst)->getID()] = (unsigned long)(*efirst);
  34        ++efirst;
  35      }
  36    }
  37 @@ -370,7 +370,7 @@
  38      while ( ffirst != flast ) {
  39                         faceMap.erase((*ffirst)->getID());
  40        (*ffirst)->makeUnique();
  41 -                       faceMap[(*ffirst)->getID()] = (unsigned int)(*ffirst);
  42 +                       faceMap[(*ffirst)->getID()] = (unsigned long)(*ffirst);
  43        ++ffirst;
  44      }
  45    };
  46 @@ -414,7 +414,7 @@
  47      // Insert the pointer.
  48      // **** WARNING!!! **** Pointer will be freed when list is deleted
  49      edge_list.push_back(edgeptr);
  50 -               edgeMap[edgeptr->getID()] = (unsigned int)edgeptr;
  51 +               edgeMap[edgeptr->getID()] = (unsigned long)edgeptr;
  52    };
  53
  54    void addFace(const DLFLFace& face);               // Insert a copy
  55 @@ -426,7 +426,7 @@
  56        // If Face doesn't have a material assigned to it, assign the default material
  57             faceptr->setMaterial(matl_list.front());
  58      face_list.push_back(faceptr);
  59 -               faceMap[faceptr->getID()] = (unsigned int)faceptr;
  60 +               faceMap[faceptr->getID()] = (unsigned long)faceptr;
  61    };
  62
  63    DLFLVertexPtr getVertexPtr(uint index) const {
  64 @@ -530,14 +530,14 @@
  65    void boundaryWalk(uint face_index);
  66    void vertexTrace(uint vertex_index);
  67
  68 -  void readObject( istream& i, istream &imtl = NULL );
  69 +  void readObject( istream& i, istream &imtl = *static_cast< istream* >( NULL ) );
  70    void readObjectAlt( istream& i );
  71 -  void readDLFL( istream& i, istream &imtl = NULL, bool clearold = true );
  72 +  void readDLFL( istream& i, istream &imtl = *static_cast< istream* >( NULL ), bool clearold = true );
  73         bool readMTL( istream &i);
  74         bool writeMTL( ostream& o );
  75
  76 -  void writeObject( ostream& o, ostream &omtl = NULL, bool with_normals = true, bool with_tex_coords = true );
  77 -  void writeDLFL(ostream& o, ostream &omtl = NULL, bool reverse_faces = false);
  78 +  void writeObject( ostream& o, ostream &omtl = *static_cast< ostream* >( NULL ), bool with_normals = true, bool with_tex_coords = true );
  79 +  void writeDLFL(ostream& o, ostream &omtl = *static_cast< ostream* >( NULL ), bool reverse_faces = false);
  80    void writeSTL(ostream& o);
  81    void writeLG3d(ostream& o, bool select = false); //!< added by dave - for LiveGraphics3D support to embed 3d models into html
  82    inline void setFilename( const char *filename ) {