Changeset 36375 for trunk/psLib/src/math/psEllipse.h

Timestamp:

Dec 10, 2013, 2:55:11 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• psLib/src/math/psEllipse.h (modified) (2 diffs)

trunk/psLib/src/math/psEllipse.h

@@ -38 +38 @@
 } psEllipseShape;
 
-/// Ellipse defined in terms of polarisations
+/// Ellipse defined in terms of polarizations
 typedef struct {
     double e0;                          ///< Scale (Mxx + Myy)
@@ -65 +65 @@
                                    );
 
-/// Convert axes to polarisation representation
+/// Convert axes to polarization representation
 psEllipsePol psEllipseAxesToPol(psEllipseAxes axes ///< Axes of ellipse
                                 );
 
-/// Convert shape to polarisation representation
+/// Convert polarization to axes representation
+psEllipseAxes psEllipsePolToAxes(const psEllipsePol pol, ///< Polarization of ellipse
+                                 const float minMinorAxis ///< Minimum allowed minor axis
+    );
+
+/// Convert shape to polarization representation
 psEllipsePol psEllipseShapeToPol(psEllipseShape shape ///< Shape of ellipse
                                  );
 
-/// Convert polarisation to axes representation
-///
-/// XXX This API goes against the PS convention of outputs being first.
-psEllipseAxes psEllipsePolToAxes(const psEllipsePol pol, ///< Polarisation of ellipse
-                                 const float minMinorAxis ///< Minimum allowed minor axis
-    );
+/// Convert shape to polarization representation
+psEllipseShape psEllipsePolToShape(psEllipsePol pol ///< Shape of ellipse
+                                 );
 
 /// @}