Attachment #577450 for bug #686086

View | Details | Raw Unified | Return to bug 686086
Collapse All | Expand All

Lines 3713-3718 Link Here

(-)a/configure (-9 / +11 lines)
3713	CFLAGS="$CFLAGS -DMISSING_DLFCN_H"	3713	CFLAGS="$CFLAGS -DMISSING_DLFCN_H"
3714	fi	3714	fi
		3715	CFLAGS="$CFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
		3716
3715	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5	3717	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
3716	$as_echo_n "checking whether byte ordering is bigendian... " >&6; }	3718	$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
3717	if ${ac_cv_c_bigendian+:} false; then :	3719	if ${ac_cv_c_bigendian+:} false; then :
Lines 4002-4011 Link Here
4002	PROJ_SETTING=missing	4004	PROJ_SETTING=missing
4003	fi	4005	fi
4004	for ac_header in projects.h	4006	for ac_header in proj_api.h
4005	do :	4007	do :
4006	ac_fn_c_check_header_mongrel "$LINENO" "projects.h" "ac_cv_header_projects_h" "$ac_includes_default"	4008	ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
4007	if test "x$ac_cv_header_projects_h" = xyes; then :	4009	if test "x$ac_cv_header_proj_api_h" = xyes; then :
4008	cat >>confdefs.h <<_ACEOF	4010	cat >>confdefs.h <<_ACEOF
4009	#define HAVE_PROJECTS_H 1	4011	#define HAVE_PROJECTS_H 1
4010	_ACEOF	4012	_ACEOF
Lines 4016-4025 Link Here
4016	if test $PROJ_SETTING = missing ; then	4018	if test $PROJ_SETTING = missing ; then
4017	as_fn_error $? "Unable to find external PROJ.4 library, give path or use default internal library." "$LINENO" 5	4019	as_fn_error $? "Unable to find external PROJ library, give path or use default internal library." "$LINENO" 5
4018	fi	4020	fi
4019	if test "$ac_cv_header_projects_h" = no ; then	4021	if test "$ac_cv_header_proj_api_h" = no ; then
4020	as_fn_error $? "Unable to find external PROJ.4 projects.h file, give path or use default internal library." "$LINENO" 5	4022	as_fn_error $? "Unable to find external PROJ proj_api.h file, give path or use default internal library." "$LINENO" 5
4021	fi	4023	fi
4022	PROJ_SETTING=external	4024	PROJ_SETTING=external
Lines 4027-4037 Link Here
4027	elif test "$with_proj" != "no" -a "$with_proj" != "" ; then	4029	elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
4028	if test -r $with_proj/include/projects.h ; then	4030	if test -r $with_proj/include/proj_api.h ; then
4029	echo "checking for $with_proj/include/projects.h ... found"	4031	echo "checking for $with_proj/include/proj_api.h ... found"
4030	PROJ_INCLUDE=-I$with_proj/include	4032	PROJ_INCLUDE=-I$with_proj/include
4031	else	4033	else
4032	as_fn_error $? "Unable to find $with_proj/include/projects.h" "$LINENO" 5	4034	as_fn_error $? "Unable to find $with_proj/include/proj_api.h" "$LINENO" 5
4033	fi	4035	fi
4034	if test -r $with_proj/lib/libproj.so ; then	4036	if test -r $with_proj/lib/libproj.so ; then




if test "$with_proj" = "yes" ; then
  AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
  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_proj_api_h" = no ; then
    AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
  fi
  PROJ_SETTING=external

elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
  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
    AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
  fi
  if test -r $with_proj/lib/libproj.so ; then

Lines 63-74 Link Here

(-)a/contrib/ogdi_import/ogdi_import.c (-6 / +1 lines)
63	#include "ecs.h"	63	#include "ecs.h"
64	#include "shapefil.h"	64	#include "shapefil.h"
65	#include <assert.h>	65	#include <assert.h>
66	#include "projects.h"	66	#include "proj_api.h"
67
68	#ifndef PJ_VERSION
69	#define projPJ PJ*
70	#define projUV UV
71	#endif
72	static int ClientID = -1;	67	static int ClientID = -1;
73	static int bNoDict = FALSE;	68	static int bNoDict = FALSE;

Lines 63-69 Link Here

(-)a/contrib/ogdi_info/ogdi_info.c (-3 / +3 lines)
63	*/	63	*/
64	#include "ecs.h"	64	#include "ecs.h"
65	#include "projects.h"	65	#include "proj_api.h"
66	static int ClientID = -1;	66	static int ClientID = -1;
67	static int bNoDict = FALSE;	67	static int bNoDict = FALSE;
Lines 214-220 Link Here
214	/* DumpGlobalRegion() */	214	/* DumpGlobalRegion() */
215	/************************************************************************/	215	/************************************************************************/
216	static int DumpGlobalRegion( ecs_Region * region, PJ * proj_defn )	216	static int DumpGlobalRegion( ecs_Region * region, projPJ proj_defn )
217	{	217	{
218	ecs_Result *result;	218	ecs_Result *result;
Lines 398-404 Link Here
398	{	398	{
399	ecs_Result *result;	399	ecs_Result *result;
400	PJ *proj_defn = NULL;	400	projPJ proj_defn = NULL;
401	/* -------------------------------------------------------------------- */	401	/* -------------------------------------------------------------------- */
402	/* Close old client if there is one active. */	402	/* Close old client if there is one active. */




  char *error_message;
  ecs_CtlPoints *cpts;
  ecs_Result *res;
  projPJ tempproj;
  if (multiblock != 0) {
    res = &cln_dummy_result;

  /* Check if the projection is valid */
  if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
    tempproj = (projPJ) cln_ProjInit(projection);
    if(tempproj == NULL) {
      res = &cln_dummy_result;
      ecs_SetError(res,1,"This projection string is invalid");

  ecs_Result *res;
  register ecs_Client *cln;
  char *server_proj;
  projPJ oldtarget,oldsource;
  ecs_Region oldreg;
  int oldisprojequal;
  int oldisTargetLL;

  if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
    cln->isTargetLL = FALSE;
    cln->target = (projPJ) cln_ProjInit(projection);
    if(cln->target == NULL) {
      goto setprojerror;
    }

  if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
    cln->isSourceLL = FALSE;
    cln->source = (projPJ) cln_ProjInit(server_proj);
    if(cln->source == NULL) {
      goto setprojerror;
    }

 *     char *d: Projection name
 *
 *  OUT
 *     return projPJ: New projection structure. If NULL, the operation
 *     is a failure.
 *
 *----------------------------------------------------------------------
 */
projPJ cln_ProjInit(d)
     char *d;
{
  int i,n;

  char *l;
  int longueur;
  char *c;
  projPJ retour;
  if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
    return NULL;

    n++;
  }
  retour = (projPJ) pj_init(n, (char **) tableau);
  free(c);
  free(tableau);

Lines 40-46 Link Here

(-)a/ogdi/c-api/ecs_dyna.c (-1 lines)
40	#include <dlfcn.h>	40	#include <dlfcn.h>
41	#endif	41	#endif
42
43	/*	42	/*
44	-------------------------------------------------	43	-------------------------------------------------

Lines 310-316 Link Here

(-)a/ogdi/c-api/ecsgeo.c (-1 / +1 lines)
310	char *projection;	310	char *projection;
311	double X1,Y1,X2,Y2;	311	double X1,Y1,X2,Y2;
312	{	312	{
313	PJ *proj;	313	projPJ proj;
314	char **argv;	314	char **argv;
315	int argc;	315	int argc;
316	double lon1,lat1,lon2,lat2;	316	double lon1,lat1,lon2,lat2;

Lines 26-32 Link Here

(-)a/ogdi/datum_driver/usa/dtusa.c (-1 / +6 lines)
26	********************************************************************/	26	********************************************************************/
27	#include "ecs.h"	27	#include "ecs.h"
28	#include "projects.h"	28	#include "proj_api.h"
		29
		30	/* Definition from Proj.4 */
		31	projUV nad_cvt(projUV, int, struct CTABLE *);
		32	struct CTABLE nad_init(projCtx ctx, char );
		33	void nad_free(struct CTABLE *);
29	typedef struct {	34	typedef struct {
30	struct CTABLE *dtptr;	35	struct CTABLE *dtptr;




#include <sys/types.h>
#include <sys/stat.h>
#include "proj_api.h"

/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
#ifndef USE_PROJUV
#  define projUV UV
#endif
#include "ecs.h"

     ecs_Family currentSelectionFamily: Current layer selection type
     char *tclprocname: attribute callback procedure for tcl
     char *target_proj: Projection descriptor
     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

  ecs_Family currentSelectionFamily; /* Current layer selection type */
  char *tclprocname;      /* attribute callback procedure for tcl */
  char *target_proj;
  projPJ target;             /* source and target projection descriptors */
  projPJ source;
  int isSourceLL;         /* flags to avoid unnecessary computation */
  int isTargetLL;
  int isProjEqual;

/* Projection conversion functions */
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));

Return to bug 686086

Lines 1579-1585 Link Here

(-)a/ogdi/c-api/client.c (-9 / +9 lines)
1579	char *error_message;	1579	char *error_message;
1580	ecs_CtlPoints *cpts;	1580	ecs_CtlPoints *cpts;
1581	ecs_Result *res;	1581	ecs_Result *res;
1582	PJ *tempproj;	1582	projPJ tempproj;
1583	if (multiblock != 0) {	1583	if (multiblock != 0) {
1584	res = &cln_dummy_result;	1584	res = &cln_dummy_result;
Lines 1601-1607 Link Here
1601	/* Check if the projection is valid */	1601	/* Check if the projection is valid */
1602	if (strncmp(projection,PROJ_LONGLAT,13) != 0) {	1602	if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
1603	tempproj = (PJ *) cln_ProjInit(projection);	1603	tempproj = (projPJ) cln_ProjInit(projection);
1604	if(tempproj == NULL) {	1604	if(tempproj == NULL) {
1605	res = &cln_dummy_result;	1605	res = &cln_dummy_result;
1606	ecs_SetError(res,1,"This projection string is invalid");	1606	ecs_SetError(res,1,"This projection string is invalid");
Lines 1778-1784 Link Here
1778	ecs_Result *res;	1778	ecs_Result *res;
1779	register ecs_Client *cln;	1779	register ecs_Client *cln;
1780	char *server_proj;	1780	char *server_proj;
1781	PJ oldtarget,oldsource;	1781	projPJ oldtarget,oldsource;
1782	ecs_Region oldreg;	1782	ecs_Region oldreg;
1783	int oldisprojequal;	1783	int oldisprojequal;
1784	int oldisTargetLL;	1784	int oldisTargetLL;
Lines 1877-1883 Link Here
1877	if (strncmp(projection,PROJ_LONGLAT,13) != 0) {	1877	if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
1878	cln->isTargetLL = FALSE;	1878	cln->isTargetLL = FALSE;
1879	cln->target = (PJ *) cln_ProjInit(projection);	1879	cln->target = (projPJ) cln_ProjInit(projection);
1880	if(cln->target == NULL) {	1880	if(cln->target == NULL) {
1881	goto setprojerror;	1881	goto setprojerror;
1882	}	1882	}
Lines 1923-1929 Link Here
1923	if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {	1923	if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
1924	cln->isSourceLL = FALSE;	1924	cln->isSourceLL = FALSE;
1925	cln->source = (PJ *) cln_ProjInit(server_proj);	1925	cln->source = (projPJ) cln_ProjInit(server_proj);
1926	if(cln->source == NULL) {	1926	if(cln->source == NULL) {
1927	goto setprojerror;	1927	goto setprojerror;
1928	}	1928	}
Lines 2331-2343 Link Here
2331	* char *d: Projection name	2331	* char *d: Projection name
2332	*	2332	*
2333	* OUT	2333	* OUT
2334	* return PJ *: New projection structure. If NULL, the operation	2334	* return projPJ: New projection structure. If NULL, the operation
2335	* is a failure.	2335	* is a failure.
2336	*	2336	*
2337	*----------------------------------------------------------------------	2337	*----------------------------------------------------------------------
2338	*/	2338	*/
2339	PJ *cln_ProjInit(d)	2339	projPJ cln_ProjInit(d)
2340	char *d;	2340	char *d;
2341	{	2341	{
2342	int i,n;	2342	int i,n;
Lines 2345-2351 Link Here
2345	char *l;	2345	char *l;
2346	int longueur;	2346	int longueur;
2347	char *c;	2347	char *c;
2348	PJ *retour;	2348	projPJ retour;
2349	if ((c = (char *) malloc(strlen(d)+3)) == NULL) {	2349	if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
2350	return NULL;	2350	return NULL;
Lines 2378-2384 Link Here
2378	n++;	2378	n++;
2379	}	2379	}
2380	retour = (PJ ) pj_init(n, (char *) tableau);	2380	retour = (projPJ) pj_init(n, (char **) tableau);
2381	free(c);	2381	free(c);
2382	free(tableau);	2382	free(tableau);

Lines 129-140 Link Here

(-)a/ogdi/include/ecs_util.h (-11 / +6 lines)
129	#include <sys/types.h>	129	#include <sys/types.h>
130	#include <sys/stat.h>	130	#include <sys/stat.h>
131	#include "projects.h"	131	#include "proj_api.h"
132
133	/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
134	#ifndef USE_PROJUV
135	# define projUV UV
136	#endif
137	#include "ecs.h"	132	#include "ecs.h"
Lines 1093-1100 Link Here
1093	ecs_Family currentSelectionFamily: Current layer selection type	1088	ecs_Family currentSelectionFamily: Current layer selection type
1094	char *tclprocname: attribute callback procedure for tcl	1089	char *tclprocname: attribute callback procedure for tcl
1095	char *target_proj: Projection descriptor	1090	char *target_proj: Projection descriptor
1096	PJ *target: target (c interface) projection descriptors	1091	projPJ target: target (c interface) projection descriptors
1097	PJ *source: source (driver) projection descriptors	1092	projPJ source: source (driver) projection descriptors
1098	ecs_Datum targetdatum: target datum information	1093	ecs_Datum targetdatum: target datum information
1099	ecs_Datum sourcedatum: source datum information	1094	ecs_Datum sourcedatum: source datum information
1100	void *dthandle: Handle to the datum driver	1095	void *dthandle: Handle to the datum driver
Lines 1131-1138 Link Here
1131	ecs_Family currentSelectionFamily; /* Current layer selection type */	1126	ecs_Family currentSelectionFamily; /* Current layer selection type */
1132	char tclprocname; / attribute callback procedure for tcl */	1127	char tclprocname; / attribute callback procedure for tcl */
1133	char *target_proj;	1128	char *target_proj;
1134	PJ target; / source and target projection descriptors */	1129	projPJ target; /* source and target projection descriptors */
1135	PJ *source;	1130	projPJ source;
1136	int isSourceLL; /* flags to avoid unnecessary computation */	1131	int isSourceLL; /* flags to avoid unnecessary computation */
1137	int isTargetLL;	1132	int isTargetLL;
1138	int isProjEqual;	1133	int isProjEqual;
Lines 1204-1210 Link Here
1204	/* Projection conversion functions */	1199	/* Projection conversion functions */
1205	PJ cln_ProjInit _ANSI_ARGS_((char d));	1200	projPJ cln_ProjInit _ANSI_ARGS_((char *d));
1206	int cln_CompareProjections _ANSI_ARGS_((int ClientID));	1201	int cln_CompareProjections _ANSI_ARGS_((int ClientID));
1207	int cln_UpdateMaxRegion _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));	1202	int cln_UpdateMaxRegion _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));
1208	int cln_ConvRegion _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));	1203	int cln_ConvRegion _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));

Lines 89-101 Link Here

(-)a/configure.in (-6 / +6 lines)
89	if test "$with_proj" = "yes" ; then	89	if test "$with_proj" = "yes" ; then
90	AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)	90	AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
91	AC_CHECK_HEADERS(projects.h)	91	AC_CHECK_HEADERS(proj_api.h)
92	if test $PROJ_SETTING = missing ; then	92	if test $PROJ_SETTING = missing ; then
93	AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])	93	AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
94	fi	94	fi
95	if test "$ac_cv_header_projects_h" = no ; then	95	if test "$ac_cv_header_proj_api_h" = no ; then
96	AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])	96	AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
97	fi	97	fi
98	PROJ_SETTING=external	98	PROJ_SETTING=external
Lines 103-113 Link Here
103	elif test "$with_proj" != "no" -a "$with_proj" != "" ; then	103	elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
104	if test -r $with_proj/include/projects.h ; then	104	if test -r $with_proj/include/proj_api.h ; then
105	echo "checking for $with_proj/include/projects.h ... found"	105	echo "checking for $with_proj/include/proj_api.h ... found"
106	PROJ_INCLUDE=-I$with_proj/include	106	PROJ_INCLUDE=-I$with_proj/include
107	else	107	else
108	AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])	108	AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
109	fi	109	fi
110	if test -r $with_proj/lib/libproj.so ; then	110	if test -r $with_proj/lib/libproj.so ; then