node size problem is solved for good

diff --git a/lib/common/memory.h b/lib/common/memory.h
index 6db0508289639964bb3c7d12b8029c3af71de091..a145e5edf8920acacf05e787892ff958b7e7b41c 100644 (file)
--- a/lib/common/memory.h
+++ b/lib/common/memory.h
@@ -48,16 +48,13 @@ extern "C" {
 #ifdef GVDLL
 #define extern __declspec(dllexport)
 #else
-#define extern
-#endif
-
-/*visual studio*/
 #ifdef WIN32_DLL
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif
 #endif
-/*end visual studio*/
+
+#endif
 
     extern void *zmalloc(size_t);
     extern void *zrealloc(void *, size_t, size_t, size_t);

diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index 5dadf9f529c967e411cc3d65f91b93ff153af45e..514d4e2129e6f47ea8b3e057f6136f96064241dd 100644 (file)
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -181,6 +181,14 @@ int GetFixedOGLPoslocal(int x, int y, float kts, GLfloat * X, GLfloat * Y,
        return 1;
 
 }
+void linear_interplotate (float x1,float y1,float x2,float y2,float x3,float* y3)
+{
+
+       float a,b;
+       a=(y1-y2)/(x1-x2);
+       b=y1-a*x1;
+       *y3=a*x3+b;
+}
 
 #if 0
 int glreversecamera(ViewInfo * view)

diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h
index 56ab3b1eb015578d391a100bf47934915b65ea5e..b44612f09a774602a045c674ed1e4e18b78eb82d 100644 (file)
--- a/lib/glcomp/glutils.h
+++ b/lib/glcomp/glutils.h
@@ -28,6 +28,6 @@ int GetOGLPosRef(int x, int y, float *X, float *Y, float *Z);
 float GetOGLDistance(int l);
 int GetFixedOGLPoslocal(int x, int y, float kts, GLfloat * X, GLfloat * Y,
                   GLfloat * Z);
-
+void linear_interplotate (float x1,float y1,float x3,float y3,float x2,float* y2);
 
 #endif