[GRASS-SVN] r45469 - in grass/branches/develbranch_6: general/g.region include

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-02-26 21:54:17 -0800 (Sat, 26 Feb 2011)
New Revision: 45469

Modified:
   grass/branches/develbranch_6/general/g.region/printwindow.c
   grass/branches/develbranch_6/include/gprojects.h
Log:
temporary solution for #1271, see http://trac.osgeo.org/proj/ticket/98

Modified: grass/branches/develbranch_6/general/g.region/printwindow.c
===================================================================
--- grass/branches/develbranch_6/general/g.region/printwindow.c	2011-02-26 20:48:43 UTC (rev 45468)
+++ grass/branches/develbranch_6/general/g.region/printwindow.c	2011-02-27 05:54:17 UTC (rev 45469)
@@ -1,6 +1,10 @@
 #include <string.h>
 #include <stdlib.h>
+
+#ifndef __MINGW32__
 #include <projects.h>
+#endif
+
 #include <grass/gis.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>

Modified: grass/branches/develbranch_6/include/gprojects.h
===================================================================
--- grass/branches/develbranch_6/include/gprojects.h	2011-02-26 20:48:43 UTC (rev 45468)
+++ grass/branches/develbranch_6/include/gprojects.h	2011-02-27 05:54:17 UTC (rev 45469)
@@ -106,4 +106,31 @@
 			      double *, double *, double *);
 void GPJ_free_ellps(struct gpj_ellps *);
 
+
+#ifdef __MINGW32__
+/* PROJ.4's private datastructures copied from projects.h as removed
+   from osgeo4w; pending better solution. see:
+   http://trac.osgeo.org/proj/ticket/98 */
+
+typedef struct { double u, v; } LP;
+
+struct DERIVS {
+    double x_l, x_p; /* derivatives of x for lambda-phi */
+    double y_l, y_p; /* derivatives of y for lambda-phi */
+};
+
+struct FACTORS {
+	struct DERIVS der;
+	double h, k;		/* meridinal, parallel scales */
+	double omega, thetap;	/* angular distortion, theta prime */
+	double conv;		/* convergence */
+	double s;		/* areal scale factor */
+	double a, b;		/* max-min scale error */
+	int code;		/* info as to analytics, see following */
+};
+
+int pj_factors(LP, void *, double, struct FACTORS *);
+/* end of copy */
 #endif
+
+#endif