sweph 2.10.3-4 → 2.10.3-6

package/swisseph/swephexp.h

@@ -400,15 +400,10 @@ extern "C" {
 #if MSDOS
 #  define SE_EPHE_PATH    "\\sweph\\ephe\\"
 #else
-# ifdef MACOS
-#  define SE_EPHE_PATH	":ephe:"
-# else
 #  define SE_EPHE_PATH    ".:/users/ephe2/:/users/ephe/"
-			/* At Astrodienst, we maintain two ephemeris areas for
-			   the thousands of asteroid files: 
-			   the short files in /users/ephe/ast*,
-			   the long file in /users/ephe2/ast*. */
-# endif
+    /* At Astrodienst, we maintain two ephemeris areas for the 600'000+  asteroid files: 
+       the short files in /users/ephe/ast*, the long file in /users/ephe2/ast*.
+       /users  is a synonym for /home on many systems */
 #endif
 #endif  /* SE_EPHE_PATH */
 

package/swisseph/swephlib.c

@@ -3151,7 +3151,7 @@ static double adjust_for_tidacc(double ans, double Y, double tid_acc, double tid
 }
 
 /* returns tidal acceleration used in swe_deltat() and swe_deltat_ex() */
-double CALL_CONV swe_get_tid_acc()
+double CALL_CONV swe_get_tid_acc(void)
 {
   return swed.tid_acc;
 }
@@ -3183,7 +3183,7 @@ void CALL_CONV swe_set_delta_t_userdef(double dt)
   }
 }
 
-int32 swi_guess_ephe_flag()
+int32 swi_guess_ephe_flag(void)
 {
   int32 iflag = SEFLG_SWIEPH;
   /* if jpl file is open, assume SEFLG_JPLEPH */
@@ -3933,9 +3933,9 @@ char *CALL_CONV swe_cs2degstr(CSEC t, char *a)
  * for definition of input see function swe_split_deg().
  * output:
  * ideg 	degrees, 
- * imin 	minutes, 
- * isec 	seconds, 
- * dsecfr	fraction of seconds 
+ * imin 	minutes, (zero if rounding to degree)
+ * isec 	seconds, (zero if rounding to minute)
+ * dsecfr	fraction of seconds (zero if rounding used) 
  * inak	nakshatra number; 
  ******************************************************************/
 static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32 *imin, int32 *isec, double *dsecfr, int32 *inak)
@@ -3977,8 +3977,12 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
   if (!(roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN | SE_SPLIT_DEG_ROUND_SEC))) {
     *dsecfr = ddeg * 3600 - *isec;
   } else {
-    *dsecfr = *isec;  // is rounded, no fractional seconds
+    *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg_nakshtra */
 
 /************************************************************
@@ -4003,8 +4007,8 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
 				       * to 10d59'59" (or 10d59' or 10d) * 
  * output:
  *  ideg 	degrees, 
- *  imin 	minutes, 
- *  isec 	seconds, 
+ *  imin 	minutes, (zero if rounding to degree)
+ *  isec 	seconds, (zero if rounding to minute or degree)
  *  dsecfr	fraction of seconds (zero if rounding used) 
  *  isgn	zodiac sign number; 
  *              or +/- sign
@@ -4052,6 +4056,10 @@ void CALL_CONV swe_split_deg(double ddeg, int32 roundflag, int32 *ideg, int32 *i
   } else {
     *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg */
 
 double swi_kepler(double E, double M, double ecce)