diff -Naur netgen-4.9.13_orig/libsrc/meshing/meshtype.cpp netgen-4.9.13_new/libsrc/meshing/meshtype.cpp --- netgen-4.9.13_orig/libsrc/meshing/meshtype.cpp 2009-09-13 14:28:38.000000000 +0400 +++ netgen-4.9.13_new/libsrc/meshing/meshtype.cpp 2011-02-18 11:47:33.000000000 +0300 @@ -1,4 +1,5 @@ #include +#include #include "meshing.hpp" @@ -650,7 +651,7 @@ double det = trans.Det(); - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else err += frob * frob / det; @@ -706,7 +707,7 @@ double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1); - if (det <= 0) + if (det <= DBL_MIN) { dd = 0; return 1e12; @@ -790,7 +791,7 @@ = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0) + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0); - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else { @@ -840,7 +841,7 @@ frob /= 2; double det = trans.Det(); - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else err += frob * frob / det; @@ -1857,7 +1858,7 @@ case PYRAMID: { double noz = 1-p(2); - if (noz == 0.0) noz = 1e-10; + if (noz <= DBL_MIN) noz = 1e-10; double xi = p(0) / noz; double eta = p(1) / noz; @@ -2035,7 +2036,7 @@ double det = -trans.Det(); - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else err += frob * frob * frob / det; @@ -2107,7 +2108,7 @@ ddet *= -1; - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else { @@ -2189,7 +2190,7 @@ det *= -1; - if (det <= 0) + if (det <= DBL_MIN) err += 1e12; else { @@ -2522,10 +2523,10 @@ MeshingParameters :: MeshingParameters () { - optimize3d = "cmdmustm"; + optimize3d = (char*)"cmdmustm"; //optimize3d = "cmdmstm"; optsteps3d = 3; - optimize2d = "smsmsmSmSmSm"; + optimize2d = (char*)"smsmsmSmSmSm"; optsteps2d = 3; opterrpow = 2; blockfill = 1; diff -Naur netgen-4.9.13_orig/libsrc/meshing/meshtype.hpp netgen-4.9.13_new/libsrc/meshing/meshtype.hpp --- netgen-4.9.13_orig/libsrc/meshing/meshtype.hpp 2009-11-09 13:50:43.000000000 +0300 +++ netgen-4.9.13_new/libsrc/meshing/meshtype.hpp 2011-02-18 11:24:03.000000000 +0300 @@ -12,7 +12,7 @@ Classes for NETGEN */ - +class Mesh; enum ELEMENT_TYPE { SEGMENT = 1, SEGMENT3 = 2, TRIG = 10, QUAD=11, TRIG6 = 12, QUAD6 = 13, QUAD8 = 14, diff -Naur netgen-4.9.13_orig/libsrc/meshing/smoothing2.cpp netgen-4.9.13_new/libsrc/meshing/smoothing2.cpp --- netgen-4.9.13_orig/libsrc/meshing/smoothing2.cpp 2009-11-09 13:47:09.000000000 +0300 +++ netgen-4.9.13_new/libsrc/meshing/smoothing2.cpp 2011-02-18 16:24:34.000000000 +0300 @@ -302,7 +302,8 @@ vgrad = 0; badness = 0; - meshthis -> GetNormalVector (surfi, sp1, gi1, n); + //meshthis -> GetNormalVector (surfi, sp1, gi1, n); + n = normal; pp1 = sp1 + x(0) * t1 + x(1) * t2; // meshthis -> ProjectPoint (surfi, pp1); @@ -360,7 +361,8 @@ vgrad = 0; badness = 0; - meshthis -> GetNormalVector (surfi, sp1, gi1, n); + //meshthis -> GetNormalVector (surfi, sp1, gi1, n); + n = normal; pp1 = sp1 + x(0) * t1 + x(1) * t2; @@ -514,7 +516,8 @@ vgrad = 0; badness = 0; - meshthis -> GetNormalVector (surfi, sp1, gi1, n); + //meshthis -> GetNormalVector (surfi, sp1, gi1, n); + n = normal; pp1 = sp1 + x(0) * t1 + x(1) * t2; @@ -586,7 +589,8 @@ vgrad = 0; badness = 0; - meshthis -> GetNormalVector (surfi, sp1, gi1, n); + //meshthis -> GetNormalVector (surfi, sp1, gi1, n); + n = normal; // pp1 = sp1; // pp1.Add2 (x.Get(1), t1, x.Get(2), t2); @@ -973,7 +977,7 @@ { mesh[pi] = Point<3> (origp); } - + break; } } diff -Naur netgen-4.9.13_orig/libsrc/occ/occconstruction.cpp netgen-4.9.13_new/libsrc/occ/occconstruction.cpp --- netgen-4.9.13_orig/libsrc/occ/occconstruction.cpp 2009-08-24 06:32:47.000000000 +0400 +++ netgen-4.9.13_new/libsrc/occ/occconstruction.cpp 2011-02-18 14:04:45.000000000 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +//#include //#include #include #include diff -Naur netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp --- netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp 2010-03-16 09:30:07.000000000 +0300 +++ netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp 2011-02-18 17:06:25.000000000 +0300 @@ -15,6 +15,7 @@ #define DIVIDEEDGESECTIONS 1000 #define IGNORECURVELENGTH 1e-4 +#define VSMALL 1e-10 bool merge_solids = 1; @@ -26,7 +27,7 @@ double nq = n*q; Point<3> p = p0 + 0.5*n; - double lambda = (p-l.p0)*n / nq; + double lambda = (fabs(nq) > 1e-10 ? (p-l.p0)*n / nq : -1); if (lambda >= 0 && lambda <= 1) { @@ -54,7 +55,7 @@ - double ComputeH (double kappa) + static double ComputeH (double kappa) { double hret; kappa *= mparam.curvaturesafety; @@ -62,7 +63,7 @@ if (mparam.maxh * kappa < 1) hret = mparam.maxh; else - hret = 1 / kappa; + hret = 1 / (kappa + VSMALL); if (mparam.maxh < hret) hret = mparam.maxh; @@ -73,7 +74,7 @@ - void RestrictHTriangle (gp_Pnt2d & par0, gp_Pnt2d & par1, gp_Pnt2d & par2, + static void RestrictHTriangle (gp_Pnt2d & par0, gp_Pnt2d & par1, gp_Pnt2d & par2, BRepLProp_SLProps * prop, Mesh & mesh, int depth, double h = 0) { int ls = -1; @@ -168,8 +169,8 @@ if(h < 1e-4*maxside) return; - - if (h > 30) return; + // commented to restrict H on a large sphere for example + //if (h > 30) return; } if (h < maxside && depth < 10) @@ -228,7 +229,7 @@ - void DivideEdge (TopoDS_Edge & edge, Array & ps, + static void DivideEdge (TopoDS_Edge & edge, Array & ps, Array & params, Mesh & mesh) { double s0, s1; @@ -247,8 +248,8 @@ hvalue[0] = 0; pnt = c->Value(s0); - double olddist = 0; - double dist = 0; + //double olddist = 0; + //double dist = 0; int tmpVal = (int)(DIVIDEEDGESECTIONS); @@ -256,15 +257,15 @@ { oldpnt = pnt; pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0)); - hvalue[i] = hvalue[i-1] + - 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))* - pnt.Distance(oldpnt); + hvalue[i] = hvalue[i-1] + min( 1.0, + 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))* + pnt.Distance(oldpnt)); //(*testout) << "mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) " << mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) // << " pnt.Distance(oldpnt) " << pnt.Distance(oldpnt) << endl; - olddist = dist; - dist = pnt.Distance(oldpnt); + //olddist = dist; + //dist = pnt.Distance(oldpnt); } // nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS])); @@ -323,6 +324,7 @@ (*testout) << "nedges = " << nedges << endl; double eps = 1e-6 * geom.GetBoundingBox().Diam(); + const double eps2 = eps * eps; for (int i = 1; i <= nvertices; i++) { @@ -332,7 +334,7 @@ bool exists = 0; if (merge_solids) for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++) - if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps) + if ( Dist2 (mesh[pi], Point<3>(mp)) < eps2 ) { exists = 1; break; @@ -362,6 +364,7 @@ { TopoDS_Face face = TopoDS::Face(exp1.Current()); int facenr = geom.fmap.FindIndex(face); + if ( facenr < 1 ) continue; // support of sub-meshes if (face2solid[0][facenr-1] == 0) face2solid[0][facenr-1] = solidnr; @@ -381,6 +384,7 @@ int facenr = 0; int edgenr = 0; + edgenr = mesh.GetNSeg(); // support of sub-meshes (*testout) << "faces = " << geom.fmap.Extent() << endl; int curr = 0; @@ -442,6 +446,8 @@ //(*testout) << "ignoring degenerated edge" << endl; continue; } + if ( geom.emap.FindIndex(edge) < 1 ) + continue; // support sub-meshes if (geom.vmap.FindIndex(TopExp::FirstVertex (edge)) == geom.vmap.FindIndex(TopExp::LastVertex (edge))) @@ -486,8 +492,8 @@ pnums.Last() = -1; for (PointIndex pi = 1; pi < first_ep; pi++) { - if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi; - if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi; + if (Dist2 (mesh[pi], fp) < eps2) pnums[0] = pi; + if (Dist2 (mesh[pi], lp) < eps2) pnums.Last() = pi; } } @@ -497,7 +503,7 @@ bool exists = 0; int j; for (j = first_ep; j <= mesh.GetNP(); j++) - if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps) + if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps2) { exists = 1; break; @@ -633,7 +639,7 @@ } (*testout) << "mesh face " << k << endl; - multithread.percent = 100 * k / (mesh.GetNFD()+1e-10); + multithread.percent = 100 * k / (mesh.GetNFD() + VSMALL); geom.facemeshstatus[k-1] = -1; @@ -901,7 +907,7 @@ // if (k != 36) continue; // (*testout) << "optimize face " << k << endl; - multithread.percent = 100 * k / (mesh.GetNFD()+1e-10); + multithread.percent = 100 * k / (mesh.GetNFD() + VSMALL); FaceDescriptor & fd = mesh.GetFaceDescriptor(k); @@ -1229,7 +1235,7 @@ mindist = min (mindist, line.Dist(lines[num])); } - mindist *= occparam.resthcloseedgefac; + mindist /= (occparam.resthcloseedgefac + VSMALL); if (mindist < 1e-3) { @@ -1456,3 +1462,4 @@ } #endif + diff -Naur netgen-4.9.13_orig/libsrc/occ/occgeom.cpp netgen-4.9.13_new/libsrc/occ/occgeom.cpp --- netgen-4.9.13_orig/libsrc/occ/occgeom.cpp 2010-03-05 16:16:21.000000000 +0300 +++ netgen-4.9.13_new/libsrc/occ/occgeom.cpp 2011-02-18 15:34:01.000000000 +0300 @@ -7,7 +7,8 @@ #include "ShapeAnalysis_ShapeContents.hxx" #include "ShapeAnalysis_CheckSmallFace.hxx" #include "ShapeAnalysis_DataMapOfShapeListOfReal.hxx" -#include "ShapeAnalysis_Surface.hxx" +#include +#include #include "BRepAlgoAPI_Fuse.hxx" #include "BRepCheck_Analyzer.hxx" #include "BRepLib.hxx" @@ -15,11 +16,18 @@ #include "ShapeFix.hxx" #include "ShapeFix_FixSmallFace.hxx" #include "Partition_Spliter.hxx" - +#include namespace netgen { - void OCCGeometry :: PrintNrShapes () + OCCGeometry::~OCCGeometry() + { + NCollection_DataMap::Iterator it(fclsmap); + for (; it.More(); it.Next()) + delete it.Value(); + } + + void OCCGeometry :: PrintNrShapes () { TopExp_Explorer e; int count = 0; @@ -952,24 +960,47 @@ + void OCCGeometry::GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj, + BRepTopAdaptor_FClass2d*& cls) const + { + //MSV: organize caching projector in the map + if (fprjmap.IsBound(surfi)) + { + proj = fprjmap.Find(surfi); + cls = fclsmap.Find(surfi); + } + else + { + const TopoDS_Face& aFace = TopoDS::Face(fmap(surfi)); + Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace); + proj = new ShapeAnalysis_Surface(aSurf); + fprjmap.Bind(surfi, proj); + cls = new BRepTopAdaptor_FClass2d(aFace,Precision::Confusion()); + fclsmap.Bind(surfi, cls); + } + } - void OCCGeometry :: Project (int surfi, Point<3> & p) const + bool OCCGeometry :: Project (int surfi, Point<3> & p, double& u, double& v) const { static int cnt = 0; if (++cnt % 1000 == 0) cout << "Project cnt = " << cnt << endl; gp_Pnt pnt(p(0), p(1), p(2)); - - double u,v; - Handle( Geom_Surface ) thesurf = BRep_Tool::Surface(TopoDS::Face(fmap(surfi))); - Handle( ShapeAnalysis_Surface ) su = new ShapeAnalysis_Surface( thesurf ); - gp_Pnt2d suval = su->ValueOfUV ( pnt, BRep_Tool::Tolerance( TopoDS::Face(fmap(surfi)) ) ); - suval.Coord( u, v); - pnt = thesurf->Value( u, v ); - - + + Handle(ShapeAnalysis_Surface) proj; + BRepTopAdaptor_FClass2d *cls; + GetFaceTools(surfi, proj, cls); + + gp_Pnt2d p2d = proj->ValueOfUV(pnt, Precision::Confusion()); + if (cls->Perform(p2d) == TopAbs_OUT) + { + return false; + } + pnt = proj->Value(p2d); + p2d.Coord(u, v); + p = Point<3> (pnt.X(), pnt.Y(), pnt.Z()); - + return true; } @@ -979,54 +1010,20 @@ { gp_Pnt p(ap(0), ap(1), ap(2)); - Handle(Geom_Surface) surface = BRep_Tool::Surface(TopoDS::Face(fmap(surfi))); - - gp_Pnt x = surface->Value (u,v); - - if (p.SquareDistance(x) <= sqr(PROJECTION_TOLERANCE)) return true; - - gp_Vec du, dv; - - surface->D1(u,v,x,du,dv); - - int count = 0; - - gp_Pnt xold; - gp_Vec n; - double det, lambda, mu; - - do { - count++; - - n = du^dv; - - det = Det3 (n.X(), du.X(), dv.X(), - n.Y(), du.Y(), dv.Y(), - n.Z(), du.Z(), dv.Z()); - - if (det < 1e-15) return false; - - lambda = Det3 (n.X(), p.X()-x.X(), dv.X(), - n.Y(), p.Y()-x.Y(), dv.Y(), - n.Z(), p.Z()-x.Z(), dv.Z())/det; - - mu = Det3 (n.X(), du.X(), p.X()-x.X(), - n.Y(), du.Y(), p.Y()-x.Y(), - n.Z(), du.Z(), p.Z()-x.Z())/det; - - u += lambda; - v += mu; - - xold = x; - surface->D1(u,v,x,du,dv); - - } while (xold.SquareDistance(x) > sqr(PROJECTION_TOLERANCE) && count < 50); - - // (*testout) << "FastProject count: " << count << endl; - - if (count == 50) return false; - - ap = Point<3> (x.X(), x.Y(), x.Z()); + Handle(ShapeAnalysis_Surface) proj; + BRepTopAdaptor_FClass2d *cls; + GetFaceTools(surfi, proj, cls); + + gp_Pnt2d p2d = proj->NextValueOfUV(gp_Pnt2d(u,v), p, Precision::Confusion()); + if (cls->Perform(p2d) == TopAbs_OUT) + { + //cout << "Projection fails" << endl; + return false; + } + + p = proj->Value(p2d); + p2d.Coord(u, v); + ap = Point<3> (p.X(), p.Y(), p.Z()); return true; } diff -Naur netgen-4.9.13_orig/libsrc/occ/occgeom.hpp netgen-4.9.13_new/libsrc/occ/occgeom.hpp --- netgen-4.9.13_orig/libsrc/occ/occgeom.hpp 2010-01-14 19:56:19.000000000 +0300 +++ netgen-4.9.13_new/libsrc/occ/occgeom.hpp 2011-02-18 15:33:10.000000000 +0300 @@ -15,8 +15,6 @@ #include "Geom_Curve.hxx" #include "Geom2d_Curve.hxx" #include "Geom_Surface.hxx" -#include "GeomAPI_ProjectPointOnSurf.hxx" -#include "GeomAPI_ProjectPointOnCurve.hxx" #include "BRepTools.hxx" #include "TopExp.hxx" #include "BRepBuilderAPI_MakeVertex.hxx" @@ -42,8 +40,6 @@ #include "Geom_Curve.hxx" #include "Geom2d_Curve.hxx" #include "Geom_Surface.hxx" -#include "GeomAPI_ProjectPointOnSurf.hxx" -#include "GeomAPI_ProjectPointOnCurve.hxx" #include "TopoDS_Wire.hxx" #include "BRepTools_WireExplorer.hxx" #include "BRepTools.hxx" @@ -68,7 +64,7 @@ #include "IGESToBRep_Reader.hxx" #include "Interface_Static.hxx" #include "GeomAPI_ExtremaCurveCurve.hxx" -#include "Standard_ErrorHandler.hxx" +//#include "Standard_ErrorHandler.hxx" #include "Standard_Failure.hxx" #include "ShapeUpgrade_ShellSewing.hxx" #include "ShapeFix_Shape.hxx" @@ -80,6 +76,10 @@ #include "ShapeAnalysis.hxx" #include "ShapeBuild_ReShape.hxx" +#include +class Handle_ShapeAnalysis_Surface; +class BRepTopAdaptor_FClass2d; + // Philippose - 29/01/2009 // OpenCascade XDE Support @@ -190,6 +190,8 @@ class OCCGeometry : public NetgenGeometry { Point<3> center; + mutable NCollection_DataMap fprjmap; + mutable NCollection_DataMap fclsmap; public: TopoDS_Shape shape; @@ -241,6 +243,8 @@ vmap.Clear(); } + ~OCCGeometry(); + void BuildFMap(); Box<3> GetBoundingBox() @@ -260,9 +264,12 @@ Point<3> Center() { return center;} - void Project (int surfi, Point<3> & p) const; + bool Project (int surfi, Point<3> & p, double& u, double& v) const; bool FastProject (int surfi, Point<3> & ap, double& u, double& v) const; + void GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj, + BRepTopAdaptor_FClass2d*& cls) const; + OCCSurface GetSurface (int surfi) { cout << "OCCGeometry::GetSurface using PLANESPACE" << endl; diff -Naur netgen-4.9.13_orig/libsrc/occ/occmeshsurf.cpp netgen-4.9.13_new/libsrc/occ/occmeshsurf.cpp --- netgen-4.9.13_orig/libsrc/occ/occmeshsurf.cpp 2009-08-24 06:32:47.000000000 +0400 +++ netgen-4.9.13_new/libsrc/occ/occmeshsurf.cpp 2011-02-18 16:27:39.000000000 +0300 @@ -6,6 +6,7 @@ #include #include #include +#include namespace netgen @@ -434,23 +435,21 @@ void MeshOptimize2dOCCSurfaces :: ProjectPoint (INDEX surfind, Point<3> & p) const { - geometry.Project (surfind, p); + double u, v; + geometry.Project (surfind, p, u, v); } int MeshOptimize2dOCCSurfaces :: ProjectPointGI (INDEX surfind, Point<3> & p, PointGeomInfo & gi) const { - double u = gi.u; - double v = gi.v; - Point<3> hp = p; - if (geometry.FastProject (surfind, hp, u, v)) - { - p = hp; - return 1; - } - ProjectPoint (surfind, p); - return CalcPointGeomInfo (surfind, gi, p); + bool ok; + if (gi.trignum > 0) + ok = geometry.FastProject (surfind, hp, gi.u, gi.v); + else + ok = geometry.Project (surfind, hp, gi.u, gi.v); + p = hp; + return ok; } @@ -680,7 +679,7 @@ if (!geometry.FastProject (surfi, hnewp, u, v)) { // cout << "Fast projection to surface fails! Using OCC projection" << endl; - geometry.Project (surfi, hnewp); + geometry.Project (surfi, hnewp, u, v); } newgi.trignum = 1; @@ -708,14 +707,17 @@ hnewp = Point<3> (pnt.X(), pnt.Y(), pnt.Z()); newp = hnewp; newgi = ap1; - }; + } void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi) { if (surfi > 0) - geometry.Project (surfi, p); - }; + { + double u, v; + geometry.Project (surfi, p, u, v); + } + } void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi) { @@ -723,9 +725,10 @@ if (!geometry.FastProject (surfi, p, gi.u, gi.v)) { cout << "Fast projection to surface fails! Using OCC projection" << endl; - geometry.Project (surfi, p); + double u, v; + geometry.Project (surfi, p, u, v); } - }; + } diff -Naur netgen-4.9.13_orig/libsrc/occ/utilities.h netgen-4.9.13_new/libsrc/occ/utilities.h --- netgen-4.9.13_orig/libsrc/occ/utilities.h 2009-08-24 06:12:24.000000000 +0400 +++ netgen-4.9.13_new/libsrc/occ/utilities.h 2011-02-18 11:24:03.000000000 +0300 @@ -33,6 +33,7 @@ #include #include +#include #include // #include "SALOME_Log.hxx" diff -Naur netgen-4.9.13_orig/libsrc/stlgeom/stlgeommesh.cpp netgen-4.9.13_new/libsrc/stlgeom/stlgeommesh.cpp --- netgen-4.9.13_orig/libsrc/stlgeom/stlgeommesh.cpp 2009-08-10 15:40:51.000000000 +0400 +++ netgen-4.9.13_new/libsrc/stlgeom/stlgeommesh.cpp 2011-02-18 11:24:03.000000000 +0300 @@ -1435,7 +1435,7 @@ if (!optstring || strlen(optstring) == 0) { - mparam.optimize2d = "smcm"; + mparam.optimize2d = (char*)"smcm"; } else { @@ -1451,7 +1451,7 @@ mparam.grading); mesh -> LoadLocalMeshSize (mparam.meshsizefilename); mesh -> CalcLocalHFromSurfaceCurvature (stlparam.resthsurfmeshcurvfac); - mparam.optimize2d = "cmsmSm"; + mparam.optimize2d = (char*)"cmsmSm"; STLSurfaceOptimization (*stlgeometry, *mesh, mparam); #ifdef STAT_STREAM (*statout) << GetTime() << " & "; @@ -1557,7 +1557,7 @@ if (!optstring || strlen(optstring) == 0) { - mparam.optimize3d = "cmdmstm"; + mparam.optimize3d = (char*)"cmdmstm"; } else { --- netgen-4.9.13_orig/nglib/nglib.h 2010-05-18 15:20:25.000000000 +0400 +++ netgen-4.9.13_new/nglib/nglib.h 2010-05-31 13:02:19.000000000 +0400 @@ -24,7 +24,7 @@ // Philippose - 14.02.2009 // Modifications for creating a DLL in Windows #ifdef WIN32 - #ifdef NGLIB_EXPORTS || nglib_EXPORTS + #if defined NGLIB_EXPORTS || defined nglib_EXPORTS #define DLL_HEADER __declspec(dllexport) #else #define DLL_HEADER __declspec(dllimport)