New upstream version 5.2.2GAupstream/5.2.2GA

1 files changed, 10 insertions, 6 deletions

diff --git a/app/bin/tcornu.h b/app/bin/tcornu.h
index 5684373..7245dfd 100644
--- a/app/bin/tcornu.h
+++ b/app/bin/tcornu.h
@@ -18,7 +18,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-typedef struct {
+#include "common.h"
+
+typedef struct extraDataCornu_t {
+		extraDataBase_t base;
 		coOrd pos[2];
 		coOrd c[2];
 		ANGLE_T a[2];
@@ -30,7 +33,7 @@ typedef struct {
 		dynArr_t arcSegs;
 		coOrd descriptionOff;
 		char * cornuPath;
-		} cornuData_t;
+		} extraDataCornu_t;
 
 typedef struct {
 		coOrd pos[2];			//All values for end if trk[end] = NULL
@@ -44,10 +47,10 @@ typedef struct {
 double CornuMaxCurve(coOrd[2],ANGLE_T[2],DIST_T[2]);
 double BezierMathMinRadius(coOrd[4]);
 coOrd BezierMathFindNearestPoint(coOrd *, coOrd[4] , int );
-track_p NewCornuTrack(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T radius[2], trkSeg_t * tempsegs, int count);
-DIST_T CornuDistance( coOrd *, coOrd[2], ANGLE_T[2], DIST_T[2], trkSeg_t * ,int , double * );
-BOOL_T FixUpCornu(coOrd pos[2], track_p [2], EPINX_T ep[2], struct extraData* xx);
-BOOL_T FixUpCornu0(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T radius[2], struct extraData* xx);
+track_p NewCornuTrack(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T radius[2], trkSeg_p tempsegs, int count);
+DIST_T CornuDistance( coOrd *, coOrd[2], ANGLE_T[2], DIST_T[2], trkSeg_p ,int , double * );
+BOOL_T FixUpCornu(coOrd pos[2], track_p [2], EPINX_T ep[2], struct extraDataCornu_t* xx);
+BOOL_T FixUpCornu0(coOrd pos[2], coOrd center[2], ANGLE_T angle[2], DIST_T radius[2], struct extraDataCornu_t* xx);
 BOOL_T GetCornuSegmentsFromTrack(track_p, trkSeg_p);
 BOOL_T SetCornuEndPt(track_p trk, EPINX_T inx, coOrd pos, coOrd center, ANGLE_T angle, DIST_T radius);
 BOOL_T RebuildCornu (track_p trk);
@@ -65,5 +68,6 @@ BOOL_T GetBezierSegmentsFromCornu(track_p, dynArr_t *, BOOL_T);
 
 char * CreateSegPathList(track_p trk);
 
+BOOL_T GetCornuMiddle( track_p trk, coOrd * pos);