patches/xplanet-01-forte.diff
author laca_
Thu, 27 Jul 2006 20:32:02 +0000
changeset 1 60fdac847787
child 7964 06ba1a07102d
permissions -rw-r--r--
initial import
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
60fdac847787 initial import
laca_
parents:
diff changeset
     1
--- xplanet-1.2.0/src/libannotate/addMarkers.cpp-orig	2005-10-26 18:35:14.911131000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
     2
+++ xplanet-1.2.0/src/libannotate/addMarkers.cpp	2005-10-26 18:38:47.249466000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
     3
@@ -9,6 +9,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
     4
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
     5
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
     6
 
60fdac847787 initial import
laca_
parents:
diff changeset
     7
+#include <stdlib.h>
60fdac847787 initial import
laca_
parents:
diff changeset
     8
+
60fdac847787 initial import
laca_
parents:
diff changeset
     9
 #include "buildPlanetMap.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    10
 #include "findFile.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    11
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    12
--- xplanet-1.2.0/src/libannotate/addSatellites.cpp-orig	2005-10-26 18:36:39.574981000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    13
+++ xplanet-1.2.0/src/libannotate/addSatellites.cpp	2005-10-26 18:39:12.986201000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    14
@@ -8,6 +8,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    15
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
    16
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    17
 
60fdac847787 initial import
laca_
parents:
diff changeset
    18
+#include "stdio.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    19
+
60fdac847787 initial import
laca_
parents:
diff changeset
    20
 #include "findFile.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    21
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    22
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    23
--- xplanet-1.2.0/src/libdisplay/DisplayBase.cpp-orig	2005-10-26 18:37:16.384496000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    24
+++ xplanet-1.2.0/src/libdisplay/DisplayBase.cpp	2005-10-26 18:38:21.118470000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    25
@@ -7,6 +7,9 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    26
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
    27
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    28
 
60fdac847787 initial import
laca_
parents:
diff changeset
    29
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    30
+#include <stdlib.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    31
+
60fdac847787 initial import
laca_
parents:
diff changeset
    32
 #include "body.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    33
 #include "findFile.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    34
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    35
--- xplanet-1.2.0/src/libdisplay/DisplayOutput.cpp-orig	2005-10-26 18:39:33.605895000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    36
+++ xplanet-1.2.0/src/libdisplay/DisplayOutput.cpp	2005-10-26 18:39:50.050437000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    37
@@ -4,6 +4,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    38
 #include <sstream>
60fdac847787 initial import
laca_
parents:
diff changeset
    39
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    40
 
60fdac847787 initial import
laca_
parents:
diff changeset
    41
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    42
+
60fdac847787 initial import
laca_
parents:
diff changeset
    43
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    44
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    45
 #include "PlanetProperties.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    46
--- xplanet-1.2.0/src/libmultiple/drawSphere.cpp-orig	2005-10-26 18:40:15.618965000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    47
+++ xplanet-1.2.0/src/libmultiple/drawSphere.cpp	2005-10-26 18:42:56.803890000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    48
@@ -1,3 +1,5 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    49
+#include <math.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    50
+
60fdac847787 initial import
laca_
parents:
diff changeset
    51
 #include "Map.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    52
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    53
 #include "View.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    54
--- xplanet-1.2.0/src/libmultiple/drawEllipsoid.cpp-orig	2005-10-26 18:43:08.255730000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    55
+++ xplanet-1.2.0/src/libmultiple/drawEllipsoid.cpp	2005-10-26 18:43:15.820042000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    56
@@ -1,3 +1,4 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    57
+#include <math.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    58
 #include "Map.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    59
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    60
 #include "View.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    61
--- xplanet-1.2.0/src/libprojection/ProjectionBonne.cpp-orig	2005-10-26 18:43:35.341687000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    62
+++ xplanet-1.2.0/src/libprojection/ProjectionBonne.cpp	2005-10-26 18:43:55.002511000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    63
@@ -13,6 +13,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    64
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
    65
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    66
 
60fdac847787 initial import
laca_
parents:
diff changeset
    67
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    68
+
60fdac847787 initial import
laca_
parents:
diff changeset
    69
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    70
 #include "ProjectionBonne.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    71
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    72
--- xplanet-1.2.0/src/libprojection/ProjectionGnomonic.cpp-orig	2005-10-26 18:44:04.191966000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    73
+++ xplanet-1.2.0/src/libprojection/ProjectionGnomonic.cpp	2005-10-26 18:44:27.110656000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    74
@@ -12,6 +12,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    75
 #include <sstream>
60fdac847787 initial import
laca_
parents:
diff changeset
    76
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    77
 
60fdac847787 initial import
laca_
parents:
diff changeset
    78
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    79
+
60fdac847787 initial import
laca_
parents:
diff changeset
    80
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    81
 #include "ProjectionGnomonic.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    82
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    83
--- xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp-orig	2005-10-26 18:44:37.267879000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    84
+++ xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp	2005-10-26 18:49:58.407269000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
    85
@@ -17,6 +17,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
    86
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
    87
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
    88
 
60fdac847787 initial import
laca_
parents:
diff changeset
    89
+#include <math.h>
60fdac847787 initial import
laca_
parents:
diff changeset
    90
+
60fdac847787 initial import
laca_
parents:
diff changeset
    91
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    92
 #include "ProjectionIcosagnomonic.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    93
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
    94
@@ -102,7 +104,19 @@ ProjectionIcosagnomonic::PointLL::sameSi
60fdac847787 initial import
laca_
parents:
diff changeset
    95
     double dp1 = PointXYZ::dotP(cp, p1);
60fdac847787 initial import
laca_
parents:
diff changeset
    96
     double dp2 = PointXYZ::dotP(cp, p2);
60fdac847787 initial import
laca_
parents:
diff changeset
    97
 
60fdac847787 initial import
laca_
parents:
diff changeset
    98
-    return (signbit(dp1) == signbit(dp2) || fabs(dp1) < 1e-10);    
60fdac847787 initial import
laca_
parents:
diff changeset
    99
+   /* Hack to workaround signbit not working on Solaris,
60fdac847787 initial import
laca_
parents:
diff changeset
   100
+      probably better to get the compiler working, but 
60fdac847787 initial import
laca_
parents:
diff changeset
   101
+      this should work for now.  This replaces:
60fdac847787 initial import
laca_
parents:
diff changeset
   102
+
60fdac847787 initial import
laca_
parents:
diff changeset
   103
+      return (signbit(dp1) == signbit(dp2) || fabs(dp1) < 1e-10);
60fdac847787 initial import
laca_
parents:
diff changeset
   104
+
60fdac847787 initial import
laca_
parents:
diff changeset
   105
+      according to the signbit manpage, it returns a non-zero
60fdac847787 initial import
laca_
parents:
diff changeset
   106
+      value if and only if the sign of the argument is negative.
60fdac847787 initial import
laca_
parents:
diff changeset
   107
+      So, with the above usage, it's true if both values are
60fdac847787 initial import
laca_
parents:
diff changeset
   108
+      negative or both are positive.  I'm assuming 0 is
60fdac847787 initial import
laca_
parents:
diff changeset
   109
+      considered positive. */
60fdac847787 initial import
laca_
parents:
diff changeset
   110
+
60fdac847787 initial import
laca_
parents:
diff changeset
   111
+    return ((dp1 < 0 && dp2 < 0 || dp1 >= 0 && dp2 >= 0) || (fabs(dp1) < 1e-10));    
60fdac847787 initial import
laca_
parents:
diff changeset
   112
 }
60fdac847787 initial import
laca_
parents:
diff changeset
   113
 
60fdac847787 initial import
laca_
parents:
diff changeset
   114
 bool
60fdac847787 initial import
laca_
parents:
diff changeset
   115
--- xplanet-1.2.0/src/libprojection/ProjectionMercator.cpp-orig	2005-10-26 18:50:27.063203000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   116
+++ xplanet-1.2.0/src/libprojection/ProjectionMercator.cpp	2005-10-26 18:50:52.203630000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   117
@@ -3,6 +3,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   118
 #include <sstream>
60fdac847787 initial import
laca_
parents:
diff changeset
   119
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   120
 
60fdac847787 initial import
laca_
parents:
diff changeset
   121
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   122
+
60fdac847787 initial import
laca_
parents:
diff changeset
   123
 #include "Options.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   124
 #include "ProjectionMercator.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   125
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   126
--- xplanet-1.2.0/src/Options.cpp-orig	2005-10-26 18:51:36.652448000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   127
+++ xplanet-1.2.0/src/Options.cpp	2005-10-26 18:51:50.422786000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   128
@@ -5,6 +5,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   129
 #include <sstream>
60fdac847787 initial import
laca_
parents:
diff changeset
   130
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   131
 
60fdac847787 initial import
laca_
parents:
diff changeset
   132
+#include <stdlib.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   133
 #include <sys/time.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   134
 
60fdac847787 initial import
laca_
parents:
diff changeset
   135
 #include "config.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   136
--- xplanet-1.2.0/src/Satellite.cpp-orig	2005-10-26 18:52:14.131864000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   137
+++ xplanet-1.2.0/src/Satellite.cpp	2005-10-26 18:52:28.383425000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   138
@@ -3,6 +3,7 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   139
 #include <iostream>
60fdac847787 initial import
laca_
parents:
diff changeset
   140
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   141
 
60fdac847787 initial import
laca_
parents:
diff changeset
   142
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   143
 #include <sys/time.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   144
 
60fdac847787 initial import
laca_
parents:
diff changeset
   145
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   146
--- xplanet-1.2.0/src/drawMultipleBodies.cpp-orig	2005-10-26 18:52:39.697423000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   147
+++ xplanet-1.2.0/src/drawMultipleBodies.cpp	2005-10-26 18:52:53.496485000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   148
@@ -7,6 +7,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   149
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
   150
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   151
 
60fdac847787 initial import
laca_
parents:
diff changeset
   152
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   153
+
60fdac847787 initial import
laca_
parents:
diff changeset
   154
 #include "body.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   155
 #include "buildPlanetMap.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   156
 #include "config.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   157
--- xplanet-1.2.0/src/parse.cpp-orig	2005-10-26 18:53:01.666309000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   158
+++ xplanet-1.2.0/src/parse.cpp	2005-10-26 18:53:11.989312000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   159
@@ -4,6 +4,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   160
 #include <string>
60fdac847787 initial import
laca_
parents:
diff changeset
   161
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   162
 
60fdac847787 initial import
laca_
parents:
diff changeset
   163
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   164
+
60fdac847787 initial import
laca_
parents:
diff changeset
   165
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   166
 #include "parseColor.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   167
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   168
--- xplanet-1.2.0/src/xpUtil.cpp-orig	2005-10-26 18:54:51.292117000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   169
+++ xplanet-1.2.0/src/xpUtil.cpp	2005-10-26 18:55:13.171041000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   170
@@ -8,6 +8,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   171
 #include <string>
60fdac847787 initial import
laca_
parents:
diff changeset
   172
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   173
 
60fdac847787 initial import
laca_
parents:
diff changeset
   174
+#include <stdlib.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   175
+#include <stdio.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   176
 #include <unistd.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   177
 extern char **environ;
60fdac847787 initial import
laca_
parents:
diff changeset
   178
 
60fdac847787 initial import
laca_
parents:
diff changeset
   179
--- xplanet-1.2.0/src/libprojection/getProjection.cpp-orig      2005-10-26 19:09:44.958907000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   180
+++ xplanet-1.2.0/src/libprojection/getProjection.cpp   2005-10-26 19:09:51.316593000 -0500
60fdac847787 initial import
laca_
parents:
diff changeset
   181
@@ -4,6 +4,8 @@
60fdac847787 initial import
laca_
parents:
diff changeset
   182
 #include <vector>
60fdac847787 initial import
laca_
parents:
diff changeset
   183
 using namespace std;
60fdac847787 initial import
laca_
parents:
diff changeset
   184
 
60fdac847787 initial import
laca_
parents:
diff changeset
   185
+#include <stdlib.h>
60fdac847787 initial import
laca_
parents:
diff changeset
   186
+
60fdac847787 initial import
laca_
parents:
diff changeset
   187
 #include "keywords.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   188
 #include "xpUtil.h"
60fdac847787 initial import
laca_
parents:
diff changeset
   189