1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
|
Index: ogdi-dfsg/configure
===================================================================
--- ogdi-dfsg.orig/configure
+++ ogdi-dfsg/configure
@@ -3939,7 +3939,7 @@
fi
-for ac_header in projects.h
+for ac_header in proj_api.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -4085,8 +4085,8 @@
{ (exit 1); exit 1; }; }
fi
if test "$ac_cv_header_projects_h" = no ; then
- { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&5
-echo "$as_me: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&2;}
+ { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&5
+echo "$as_me: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4095,12 +4095,12 @@
elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- if test -r $with_proj/include/projects.h ; then
- echo "checking for $with_proj/include/projects.h ... found"
+ if test -r $with_proj/include/proj_api.h ; then
+ echo "checking for $with_proj/include/proj_api.h ... found"
PROJ_INCLUDE=-I$with_proj/include
else
- { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/projects.h" >&5
-echo "$as_me: error: Unable to find $with_proj/include/projects.h" >&2;}
+ { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/proj_api.h" >&5
+echo "$as_me: error: Unable to find $with_proj/include/proj_api.h" >&2;}
{ (exit 1); exit 1; }; }
fi
Index: ogdi-dfsg/configure.in
===================================================================
--- ogdi-dfsg.orig/configure.in
+++ ogdi-dfsg/configure.in
@@ -81,13 +81,13 @@
if test "$with_proj" = "yes" ; then
AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
- AC_CHECK_HEADERS(projects.h)
+ AC_CHECK_HEADERS(proj_api.h)
if test $PROJ_SETTING = missing ; then
AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
fi
if test "$ac_cv_header_projects_h" = no ; then
- AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])
+ AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
fi
PROJ_SETTING=external
@@ -95,11 +95,11 @@
elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- if test -r $with_proj/include/projects.h ; then
- echo "checking for $with_proj/include/projects.h ... found"
+ if test -r $with_proj/include/projapi.h ; then
+ echo "checking for $with_proj/include/proj_api.h ... found"
PROJ_INCLUDE=-I$with_proj/include
else
- AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])
+ AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
fi
if test -r $with_proj/lib/libproj.so ; then
Index: ogdi-dfsg/ogdi/c-api/client.c
===================================================================
--- ogdi-dfsg.orig/ogdi/c-api/client.c
+++ ogdi-dfsg/ogdi/c-api/client.c
@@ -1576,7 +1576,7 @@
char *error_message;
ecs_CtlPoints *cpts;
ecs_Result *res;
- PJ *tempproj;
+ projPJ tempproj;
if (multiblock != 0) {
res = &cln_dummy_result;
@@ -1598,7 +1598,7 @@
/* Check if the projection is valid */
if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
- tempproj = (PJ *) cln_ProjInit(projection);
+ tempproj = (projPJ) cln_ProjInit(projection);
if(tempproj == NULL) {
res = &cln_dummy_result;
ecs_SetError(res,1,"This projection string is invalid");
@@ -1775,7 +1775,7 @@
ecs_Result *res;
register ecs_Client *cln;
char *server_proj;
- PJ *oldtarget,*oldsource;
+ projPJ oldtarget,oldsource;
ecs_Region oldreg;
int oldisprojequal;
int oldisTargetLL;
@@ -1874,7 +1874,7 @@
if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
cln->isTargetLL = FALSE;
- cln->target = (PJ *) cln_ProjInit(projection);
+ cln->target = (projPJ) cln_ProjInit(projection);
if(cln->target == NULL) {
goto setprojerror;
}
@@ -1920,7 +1920,7 @@
if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
cln->isSourceLL = FALSE;
- cln->source = (PJ *) cln_ProjInit(server_proj);
+ cln->source = (projPJ) cln_ProjInit(server_proj);
if(cln->source == NULL) {
goto setprojerror;
}
@@ -2328,13 +2328,13 @@
* char *d: Projection name
*
* OUT
- * return PJ *: New projection structure. If NULL, the operation
+ * return projPJ: New projection structure. If NULL, the operation
* is a failure.
*
*----------------------------------------------------------------------
*/
-PJ *cln_ProjInit(d)
+projPJ cln_ProjInit(d)
char *d;
{
int i,n;
@@ -2343,7 +2343,7 @@
char *l;
int longueur;
char *c;
- PJ *retour;
+ projPJ retour;
if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
return NULL;
@@ -2378,7 +2378,7 @@
n++;
}
- retour = (PJ *) pj_init(n, (char **) tableau);
+ retour = (projPJ) pj_init(n, (char **) tableau);
free(c);
free(tableau);
Index: ogdi-dfsg/ogdi/c-api/ecsgeo.c
===================================================================
--- ogdi-dfsg.orig/ogdi/c-api/ecsgeo.c
+++ ogdi-dfsg/ogdi/c-api/ecsgeo.c
@@ -310,7 +310,7 @@
char *projection;
double X1,Y1,X2,Y2;
{
- PJ *proj;
+ projPJ proj;
char **argv;
int argc;
double lon1,lat1,lon2,lat2;
Index: ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
===================================================================
--- ogdi-dfsg.orig/ogdi/datum_driver/usa/dtusa.c
+++ ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
@@ -26,7 +26,12 @@
********************************************************************/
#include "ecs.h"
-#include "projects.h"
+#include "proj_api.h"
+
+/* Definition from Proj.4 */
+projUV nad_cvt(projUV, int, struct CTABLE *);
+struct CTABLE *nad_init(projCtx ctx, char *);
+void nad_free(struct CTABLE *);
typedef struct {
struct CTABLE *dtptr;
@@ -124,7 +129,7 @@
strcat(pathfile,"/");
strcat(pathfile,table);
- ptr->dtptr = nad_init(pathfile);
+ ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
if (ptr->dtptr == NULL) {
ptr->count--;
return FALSE;
Index: ogdi-dfsg/ogdi/include/ecs_util.h
===================================================================
--- ogdi-dfsg.orig/ogdi/include/ecs_util.h
+++ ogdi-dfsg/ogdi/include/ecs_util.h
@@ -105,12 +105,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "projects.h"
-
-/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
-#ifndef USE_PROJUV
-# define projUV UV
-#endif
+#include "proj_api.h"
#include "ecs.h"
@@ -1054,8 +1049,8 @@
ecs_Family currentSelectionFamily: Current layer selection type
char *tclprocname: attribute callback procedure for tcl
char *target_proj: Projection descriptor
- PJ *target: target (c interface) projection descriptors
- PJ *source: source (driver) projection descriptors
+ projPJ target: target (c interface) projection descriptors
+ projPJ source: source (driver) projection descriptors
ecs_Datum targetdatum: target datum information
ecs_Datum sourcedatum: source datum information
void *dthandle: Handle to the datum driver
@@ -1092,8 +1088,8 @@
ecs_Family currentSelectionFamily; /* Current layer selection type */
char *tclprocname; /* attribute callback procedure for tcl */
char *target_proj;
- PJ *target; /* source and target projection descriptors */
- PJ *source;
+ projPJ target; /* source and target projection descriptors */
+ projPJ source;
int isSourceLL; /* flags to avoid unnecessary computation */
int isTargetLL;
int isProjEqual;
@@ -1165,7 +1161,7 @@
/* Projection conversion functions */
-PJ *cln_ProjInit _ANSI_ARGS_((char *d));
+projPJ cln_ProjInit _ANSI_ARGS_((char *d));
int cln_CompareProjections _ANSI_ARGS_((int ClientID));
int cln_UpdateMaxRegion _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));
int cln_ConvRegion _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));
Index: ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
===================================================================
--- ogdi-dfsg.orig/contrib/ogdi_import/ogdi_import.c
+++ ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
@@ -63,12 +63,7 @@
#include "ecs.h"
#include "shapefil.h"
#include <assert.h>
-#include "projects.h"
-
-#ifndef PJ_VERSION
-#define projPJ PJ*
-#define projUV UV
-#endif
+#include "proj_api.h"
static int ClientID = -1;
static int bNoDict = FALSE;
Index: ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
===================================================================
--- ogdi-dfsg.orig/contrib/ogdi_info/ogdi_info.c
+++ ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
@@ -63,7 +63,7 @@
*/
#include "ecs.h"
-#include "projects.h"
+#include "proj_api.h"
static int ClientID = -1;
static int bNoDict = FALSE;
@@ -214,7 +214,7 @@
/* DumpGlobalRegion() */
/************************************************************************/
-static int DumpGlobalRegion( ecs_Region * region, PJ * proj_defn )
+static int DumpGlobalRegion( ecs_Region * region, projPJ proj_defn )
{
ecs_Result *result;
@@ -398,7 +398,7 @@
{
ecs_Result *result;
- PJ *proj_defn = NULL;
+ projPJ proj_defn = NULL;
/* -------------------------------------------------------------------- */
/* Close old client if there is one active. */
|
GitWeb