devel/FlightGear-Atlas/FlightGear-Atlas-0.3.1-build-fixes.patch

diff -uNrp Atlas-0.3.1.orig/src/Atlas.cxx Atlas-0.3.1.buildfixes/src/Atlas.cxx
--- Atlas-0.3.1.orig/src/Atlas.cxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Atlas.cxx	2008-12-14 19:18:15.000000000 +0100
@@ -29,12 +29,14 @@
 #include <memory.h>
 #include <stdio.h>
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include <string>
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/io/sg_serial.hxx>
+#include <iostream>
 
 #include "MapBrowser.hxx"
 #include "Overlays.hxx"
@@ -42,6 +44,8 @@
 
 #define SCALECHANGEFACTOR 1.3f
 
+using namespace std;
+
 SGIOChannel *input_channel;
 
 bool dragmode = false;
diff -uNrp Atlas-0.3.1.orig/src/fg_mkdir.cxx Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx
--- Atlas-0.3.1.orig/src/fg_mkdir.cxx	2005-01-28 13:54:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx	2008-12-14 19:29:06.000000000 +0100
@@ -34,6 +34,7 @@
 #endif
 #include <string.h>
 #include <string>
+#include <stdlib.h>
 
 using namespace std;
 
diff -uNrp Atlas-0.3.1.orig/src/FlightTrack.hxx Atlas-0.3.1.buildfixes/src/FlightTrack.hxx
--- Atlas-0.3.1.orig/src/FlightTrack.hxx	2003-01-07 22:51:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/FlightTrack.hxx	2008-12-14 19:16:24.000000000 +0100
@@ -27,7 +27,7 @@
 #include <plib/sg.h>
 #include <simgear/compiler.h>
 
-SG_USING_STD(list);
+using namespace std;
 
 struct FlightData {
   float lat, lon, alt, hdg, spd;
diff -uNrp Atlas-0.3.1.orig/src/MapBrowser.hxx Atlas-0.3.1.buildfixes/src/MapBrowser.hxx
--- Atlas-0.3.1.orig/src/MapBrowser.hxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapBrowser.hxx	2008-12-14 19:15:36.000000000 +0100
@@ -27,11 +27,13 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <math.h>
 #include <list>
 #include <map>
 
+using namespace std;
+
 class MapBrowser {
 public:
   static const int CACHE_LIMIT = 2;
diff -uNrp Atlas-0.3.1.orig/src/Map.cxx Atlas-0.3.1.buildfixes/src/Map.cxx
--- Atlas-0.3.1.orig/src/Map.cxx	2006-10-26 23:45:05.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Map.cxx	2008-12-14 19:22:18.000000000 +0100
@@ -39,7 +39,7 @@
 #include <plib/ul.h>
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #ifdef UL_GLX
 #  define GLX_GLXEXT_PROTOTYPES
 #  ifdef __APPLE__
@@ -50,7 +50,8 @@
 #elif defined UL_WIN32
 #  include <windows.h>
 #endif
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -65,10 +66,10 @@
 #include <simgear/screen/RenderTexture.h>
 #include "Scenery.hxx"
 #include <vector>
-#include STL_STRING
+#include <string>
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.cxx Atlas-0.3.1.buildfixes/src/MapMaker.cxx
--- Atlas-0.3.1.orig/src/MapMaker.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapMaker.cxx	2008-12-14 19:25:59.000000000 +0100
@@ -31,8 +31,12 @@
 #endif
 #include <sys/stat.h>
 #include <plib/ul.h>
+#include <iostream>
 
 #include "MapMaker.hxx"
+
+using namespace std;
+
 /*#include <simgear/magvar/magvar.hxx>*/
 
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
@@ -653,15 +657,13 @@ int MapMaker::process_binary_file( char 
 
   /* convert point_list of wgs84 nodes to a list of points transformed
      into the maps local coordinate system */
-  const point_list wgs84_nodes = tile.get_wgs84_nodes();
-  for ( point_list::const_iterator node = wgs84_nodes . begin(); 
-	node != wgs84_nodes . end();
-	node++ ) {
+  std::vector<SGVec3d> wgs84_nodes = tile.get_wgs84_nodes();
+  for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
 
     float *nv = new sgVec3;
-    for (i = 0; i < 3; i++) {
-      tmp[i] = (*node)[i];
-    }
+    tmp[0] = wgs84_nodes[i].x();
+    tmp[1] = wgs84_nodes[i].y();
+    tmp[2] = wgs84_nodes[i].z();
     
     sgAddVec3(tmp, gbs);
     double pr = sgLengthVec3( tmp );
@@ -674,17 +676,15 @@ int MapMaker::process_binary_file( char 
   }
 
   // same as above for normals
-  const point_list m_norms = tile.get_normals();
-  for ( point_list::const_iterator normal = m_norms.begin(); 
-	normal != m_norms.end();
-	normal++ ) {
+  std::vector<SGVec3f> m_norms = tile.get_normals();
+  for ( i = 0; i < (int)m_norms.size(); ++i ) {
     // Make a new normal
     float *nn = new sgVec3;
     
-    for (i = 0; i < 3; i++) {
-      nn[i] = (*normal)[i];
-    }
-    
+    nn[0]=m_norms[i].x();
+    nn[1]=m_norms[i].y();
+    nn[2]=m_norms[i].z();
+
     n.push_back( nn );
     normals++;
   }
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.hxx Atlas-0.3.1.buildfixes/src/MapMaker.hxx
--- Atlas-0.3.1.orig/src/MapMaker.hxx	2005-02-26 19:40:36.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/MapMaker.hxx	2008-12-14 19:21:14.000000000 +0100
@@ -31,15 +31,12 @@
 #include <vector>
 #include <list>
 #include <map>
-#include STL_STRING
+#include <string>
 
 #include "Output.hxx"
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
 // Appends a path separator to a directory path if not present.
 // Calling function MUST ENSURE that there is space allocated for the potential strcat.
diff -uNrp Atlas-0.3.1.orig/src/MapPS.cxx Atlas-0.3.1.buildfixes/src/MapPS.cxx
--- Atlas-0.3.1.orig/src/MapPS.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapPS.cxx	2008-12-14 19:30:05.000000000 +0100
@@ -38,9 +38,9 @@
 #include "OutputPS.hxx"
 #include <plib/ul.h>
 #include "Scenery.hxx"
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/OutputGL.hxx Atlas-0.3.1.buildfixes/src/OutputGL.hxx
--- Atlas-0.3.1.orig/src/OutputGL.hxx	2005-02-26 19:40:37.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/OutputGL.hxx	2008-12-09 16:24:17.000000000 +0100
@@ -2,7 +2,8 @@
 #define __OUTPUTGL_H__
 
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include "Output.hxx"
diff -uNrp Atlas-0.3.1.orig/src/Overlays.cxx Atlas-0.3.1.buildfixes/src/Overlays.cxx
--- Atlas-0.3.1.orig/src/Overlays.cxx	2006-10-26 13:56:25.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Overlays.cxx	2008-12-14 19:13:40.000000000 +0100
@@ -27,7 +27,7 @@
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(map);
+using namespace std;
 
 #ifdef _MSC_VER
 
diff -uNrp Atlas-0.3.1.orig/src/Overlays.hxx Atlas-0.3.1.buildfixes/src/Overlays.hxx
--- Atlas-0.3.1.orig/src/Overlays.hxx	2005-01-10 14:15:53.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Overlays.hxx	2008-12-14 19:14:53.000000000 +0100
@@ -35,6 +35,8 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 
+using namespace std;
+
 class Overlays {
 public:
   static const int OVERLAY_AIRPORTS    = 1 << 0;
diff -uNrp Atlas-0.3.1.orig/src/Scenery.cxx Atlas-0.3.1.buildfixes/src/Scenery.cxx
--- Atlas-0.3.1.orig/src/Scenery.cxx	2005-02-26 19:39:14.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Scenery.cxx	2008-12-14 19:27:15.000000000 +0100
@@ -3,8 +3,7 @@
 
 #include "MapMaker.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
1	diff -uNrp Atlas-0.3.1.orig/src/Atlas.cxx Atlas-0.3.1.buildfixes/src/Atlas.cxx
2	--- Atlas-0.3.1.orig/src/Atlas.cxx 2006-10-28 18:28:32.000000000 +0200
3	+++ Atlas-0.3.1.buildfixes/src/Atlas.cxx 2008-12-14 19:18:15.000000000 +0100
4	@@ -29,12 +29,14 @@
5	#include <memory.h>
6	#include <stdio.h>
7	#include <simgear/compiler.h>
8	-#include SG_GLUT_H
9	+#include <GL/gl.h>
10	+#include <GL/glut.h>
11	#include <plib/fnt.h>
12	#include <plib/pu.h>
13	#include <string>
14	#include <simgear/io/sg_socket.hxx>
15	#include <simgear/io/sg_serial.hxx>
16	+#include <iostream>
17
18	#include "MapBrowser.hxx"
19	#include "Overlays.hxx"
20	@@ -42,6 +44,8 @@
21
22	#define SCALECHANGEFACTOR 1.3f
23
24	+using namespace std;
25	+
26	SGIOChannel *input_channel;
27
28	bool dragmode = false;
29	diff -uNrp Atlas-0.3.1.orig/src/fg_mkdir.cxx Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx
30	--- Atlas-0.3.1.orig/src/fg_mkdir.cxx 2005-01-28 13:54:12.000000000 +0100
31	+++ Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx 2008-12-14 19:29:06.000000000 +0100
32	@@ -34,6 +34,7 @@
33	#endif
34	#include <string.h>
35	#include <string>
36	+#include <stdlib.h>
37
38	using namespace std;
39
40	diff -uNrp Atlas-0.3.1.orig/src/FlightTrack.hxx Atlas-0.3.1.buildfixes/src/FlightTrack.hxx
41	--- Atlas-0.3.1.orig/src/FlightTrack.hxx 2003-01-07 22:51:12.000000000 +0100
42	+++ Atlas-0.3.1.buildfixes/src/FlightTrack.hxx 2008-12-14 19:16:24.000000000 +0100
43	@@ -27,7 +27,7 @@
44	#include <plib/sg.h>
45	#include <simgear/compiler.h>
46
47	-SG_USING_STD(list);
48	+using namespace std;
49
50	struct FlightData {
51	float lat, lon, alt, hdg, spd;
52	diff -uNrp Atlas-0.3.1.orig/src/MapBrowser.hxx Atlas-0.3.1.buildfixes/src/MapBrowser.hxx
53	--- Atlas-0.3.1.orig/src/MapBrowser.hxx 2006-10-28 18:28:32.000000000 +0200
54	+++ Atlas-0.3.1.buildfixes/src/MapBrowser.hxx 2008-12-14 19:15:36.000000000 +0100
55	@@ -27,11 +27,13 @@
56	#include "FlightTrack.hxx"
57	#include "Projection.hxx"
58	#include <simgear/compiler.h>
59	-#include SG_GL_H
60	+#include <osg/GL>
61	#include <math.h>
62	#include <list>
63	#include <map>
64
65	+using namespace std;
66	+
67	class MapBrowser {
68	public:
69	static const int CACHE_LIMIT = 2;
70	diff -uNrp Atlas-0.3.1.orig/src/Map.cxx Atlas-0.3.1.buildfixes/src/Map.cxx
71	--- Atlas-0.3.1.orig/src/Map.cxx 2006-10-26 23:45:05.000000000 +0200
72	+++ Atlas-0.3.1.buildfixes/src/Map.cxx 2008-12-14 19:22:18.000000000 +0100
73	@@ -39,7 +39,7 @@
74	#include <plib/ul.h>
75
76	#include <simgear/compiler.h>
77	-#include SG_GL_H
78	+#include <osg/GL>
79	#ifdef UL_GLX
80	# define GLX_GLXEXT_PROTOTYPES
81	# ifdef __APPLE__
82	@@ -50,7 +50,8 @@
83	#elif defined UL_WIN32
84	# include <windows.h>
85	#endif
86	-#include SG_GLUT_H
87	+#include <GL/gl.h>
88	+#include <GL/glut.h>
89	#include <stdlib.h>
90	#include <stdio.h>
91	#include <sys/stat.h>
92	@@ -65,10 +66,10 @@
93	#include <simgear/screen/RenderTexture.h>
94	#include "Scenery.hxx"
95	#include <vector>
96	-#include STL_STRING
97	+#include <string>
98	+#include <iostream>
99
100	-SG_USING_STD(vector);
101	-SG_USING_STD(string);
102	+using namespace std;
103
104	typedef vector<string> string_list;
105
106	diff -uNrp Atlas-0.3.1.orig/src/MapMaker.cxx Atlas-0.3.1.buildfixes/src/MapMaker.cxx
107	--- Atlas-0.3.1.orig/src/MapMaker.cxx 2005-09-29 21:18:01.000000000 +0200
108	+++ Atlas-0.3.1.buildfixes/src/MapMaker.cxx 2008-12-14 19:25:59.000000000 +0100
109	@@ -31,8 +31,12 @@
110	#endif
111	#include <sys/stat.h>
112	#include <plib/ul.h>
113	+#include <iostream>
114
115	#include "MapMaker.hxx"
116	+
117	+using namespace std;
118	+
119	/#include <simgear/magvar/magvar.hxx>/
120
121	// Utility function that I needed to put somewhere - this probably isn't the best place for it.
122	@@ -653,15 +657,13 @@ int MapMaker::process_binary_file( char
123
124	/* convert point_list of wgs84 nodes to a list of points transformed
125	into the maps local coordinate system */
126	- const point_list wgs84_nodes = tile.get_wgs84_nodes();
127	- for ( point_list::const_iterator node = wgs84_nodes . begin();
128	- node != wgs84_nodes . end();
129	- node++ ) {
130	+ std::vector<SGVec3d> wgs84_nodes = tile.get_wgs84_nodes();
131	+ for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
132
133	float *nv = new sgVec3;
134	- for (i = 0; i < 3; i++) {
135	- tmp[i] = (*node)[i];
136	- }
137	+ tmp[0] = wgs84_nodes[i].x();
138	+ tmp[1] = wgs84_nodes[i].y();
139	+ tmp[2] = wgs84_nodes[i].z();
140
141	sgAddVec3(tmp, gbs);
142	double pr = sgLengthVec3( tmp );
143	@@ -674,17 +676,15 @@ int MapMaker::process_binary_file( char
144	}
145
146	// same as above for normals
147	- const point_list m_norms = tile.get_normals();
148	- for ( point_list::const_iterator normal = m_norms.begin();
149	- normal != m_norms.end();
150	- normal++ ) {
151	+ std::vector<SGVec3f> m_norms = tile.get_normals();
152	+ for ( i = 0; i < (int)m_norms.size(); ++i ) {
153	// Make a new normal
154	float *nn = new sgVec3;
155
156	- for (i = 0; i < 3; i++) {
157	- nn[i] = (*normal)[i];
158	- }
159	-
160	+ nn[0]=m_norms[i].x();
161	+ nn[1]=m_norms[i].y();
162	+ nn[2]=m_norms[i].z();
163	+
164	n.push_back( nn );
165	normals++;
166	}
167	diff -uNrp Atlas-0.3.1.orig/src/MapMaker.hxx Atlas-0.3.1.buildfixes/src/MapMaker.hxx
168	--- Atlas-0.3.1.orig/src/MapMaker.hxx 2005-02-26 19:40:36.000000000 +0100
169	+++ Atlas-0.3.1.buildfixes/src/MapMaker.hxx 2008-12-14 19:21:14.000000000 +0100
170	@@ -31,15 +31,12 @@
171	#include <vector>
172	#include <list>
173	#include <map>
174	-#include STL_STRING
175	+#include <string>
176
177	#include "Output.hxx"
178	#include "Overlays.hxx"
179	#include "Geodesy.hxx"
180
181	-SG_USING_STD(vector);
182	-SG_USING_STD(string);
183	-
184	// Utility function that I needed to put somewhere - this probably isn't the best place for it.
185	// Appends a path separator to a directory path if not present.
186	// Calling function MUST ENSURE that there is space allocated for the potential strcat.
187	diff -uNrp Atlas-0.3.1.orig/src/MapPS.cxx Atlas-0.3.1.buildfixes/src/MapPS.cxx
188	--- Atlas-0.3.1.orig/src/MapPS.cxx 2005-09-29 21:18:01.000000000 +0200
189	+++ Atlas-0.3.1.buildfixes/src/MapPS.cxx 2008-12-14 19:30:05.000000000 +0100
190	@@ -38,9 +38,9 @@
191	#include "OutputPS.hxx"
192	#include <plib/ul.h>
193	#include "Scenery.hxx"
194	+#include <iostream>
195
196	-SG_USING_STD(vector);
197	-SG_USING_STD(string);
198	+using namespace std;
199
200	typedef vector<string> string_list;
201
202	diff -uNrp Atlas-0.3.1.orig/src/OutputGL.hxx Atlas-0.3.1.buildfixes/src/OutputGL.hxx
203	--- Atlas-0.3.1.orig/src/OutputGL.hxx 2005-02-26 19:40:37.000000000 +0100
204	+++ Atlas-0.3.1.buildfixes/src/OutputGL.hxx 2008-12-09 16:24:17.000000000 +0100
205	@@ -2,7 +2,8 @@
206	#define __OUTPUTGL_H__
207
208	#include <simgear/compiler.h>
209	-#include SG_GLUT_H
210	+#include <GL/gl.h>
211	+#include <GL/glut.h>
212	#include <plib/fnt.h>
213	#include <plib/pu.h>
214	#include "Output.hxx"
215	diff -uNrp Atlas-0.3.1.orig/src/Overlays.cxx Atlas-0.3.1.buildfixes/src/Overlays.cxx
216	--- Atlas-0.3.1.orig/src/Overlays.cxx 2006-10-26 13:56:25.000000000 +0200
217	+++ Atlas-0.3.1.buildfixes/src/Overlays.cxx 2008-12-14 19:13:40.000000000 +0100
218	@@ -27,7 +27,7 @@
219	#include "Overlays.hxx"
220	#include "Geodesy.hxx"
221
222	-SG_USING_STD(map);
223	+using namespace std;
224
225	#ifdef _MSC_VER
226
227	diff -uNrp Atlas-0.3.1.orig/src/Overlays.hxx Atlas-0.3.1.buildfixes/src/Overlays.hxx
228	--- Atlas-0.3.1.orig/src/Overlays.hxx 2005-01-10 14:15:53.000000000 +0100
229	+++ Atlas-0.3.1.buildfixes/src/Overlays.hxx 2008-12-14 19:14:53.000000000 +0100
230	@@ -35,6 +35,8 @@
231	#include "FlightTrack.hxx"
232	#include "Projection.hxx"
233
234	+using namespace std;
235	+
236	class Overlays {
237	public:
238	static const int OVERLAY_AIRPORTS = 1 << 0;
239	diff -uNrp Atlas-0.3.1.orig/src/Scenery.cxx Atlas-0.3.1.buildfixes/src/Scenery.cxx
240	--- Atlas-0.3.1.orig/src/Scenery.cxx 2005-02-26 19:39:14.000000000 +0100
241	+++ Atlas-0.3.1.buildfixes/src/Scenery.cxx 2008-12-14 19:27:15.000000000 +0100
242	@@ -3,8 +3,7 @@
243
244	#include "MapMaker.hxx"
245
246	-SG_USING_STD(vector);
247	-SG_USING_STD(string);
248	+using namespace std;
249
250	typedef vector<string> string_list;
251
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2