Changeset 6565 for branches/rel10_ifa/psModules/src/pslib

Timestamp:

Mar 8, 2006, 6:25:04 PM (20 years ago)

Author:

Paul Price

Message:

Building without objects until discrepancies between PAP and EAM over pmHDU,pmFPA,etc are resolved

Location:

branches/rel10_ifa/psModules/src/pslib

Files:

• Makefile.am (modified) (2 diffs)
• psEllipse.c (modified) (3 diffs)
• psEllipse.h (modified) (3 diffs)

branches/rel10_ifa/psModules/src/pslib/Makefile.am

@@ -4 +4 @@
 libpsmodulepslib_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulepslib_la_SOURCES  = \
-    psAdditionals.c \
+    psEllipse.c \
     psImageJpeg.c \
     psLine.c \
@@ -12 +12 @@
 psmoduleincludedir = $(includedir)
 psmoduleinclude_HEADERS = \
-    psAdditionals.h \
+    psEllipse.h \
     psImageJpeg.h \
     psLine.h \

branches/rel10_ifa/psModules/src/pslib/psEllipse.c

@@ -2 +2 @@
 # include "psEllipse.h"
 
-EllipseAxes EllipseMomentsToAxes (EllipseMoments moments)
+psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments)
 {
 
-    EllipseAxes axes;
+    psEllipseAxes axes;
 
     double f = sqrt (0.25*PS_SQR(moments.x2 - moments.y2) + PS_SQR(moments.xy));
@@ -20 +20 @@
 }
 
-EllipseShape EllipseAxesToShape (EllipseAxes axes)
+psEllipseShape psEllipseAxesToShape (psEllipseAxes axes)
 {
 
-    EllipseShape shape;
+    psEllipseShape shape;
 
     double r1 = 1.0 / PS_SQR(axes.major) + 1.0 / PS_SQR(axes.minor);
@@ -38 +38 @@
 }
 
-EllipseAxes EllipseShapeToAxes (EllipseShape shape)
+psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape)
 {
 
-    EllipseAxes axes;
+    psEllipseAxes axes;
 
     double f1 = 1.0 / PS_SQR(shape.sx) + 1.0 / PS_SQR(shape.sy);

branches/rel10_ifa/psModules/src/pslib/psEllipse.h

@@ -6 +6 @@
     double theta;
 }
-EllipseAxes;
+psEllipseAxes;
 
 typedef struct
@@ -14 +14 @@
     double xy;
 }
-EllipseMoments;
+psEllipseMoments;
 
 typedef struct
@@ -22 +22 @@
     double sxy;
 }
-EllipseShape;
+psEllipseShape;
 
 // conversions between elliptical shape representations
-EllipseAxes EllipseMomentsToAxes (EllipseMoments moments);
-EllipseShape EllipseAxesToShape (EllipseAxes axes);
-EllipseAxes EllipseShapeToAxes (EllipseShape shape);
+psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments);
+psEllipseShape psEllipseAxesToShape (psEllipseAxes axes);
+psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape);