[GRASS-SVN] r38774 - grass/branches/develbranch_6/raster/r.sun2

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-08-17 09:32:31 -0400 (Mon, 17 Aug 2009)
New Revision: 38774

Modified:
   grass/branches/develbranch_6/raster/r.sun2/main.c
Log:
longin without latin is valid if civiltime is used (merge from trunk)

Modified: grass/branches/develbranch_6/raster/r.sun2/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.sun2/main.c	2009-08-17 13:30:55 UTC (rev 38773)
+++ grass/branches/develbranch_6/raster/r.sun2/main.c	2009-08-17 13:32:31 UTC (rev 38774)
@@ -751,7 +751,9 @@
     if ((latin != NULL || longin != NULL) && (G_projection() == PROJECTION_LL))
 	G_warning(_("latin and longin raster maps have no effect when in a Lat/Lon location"));
 	/* true about longin= when civiltime is used? */
-    if ((latin == NULL && longin != NULL) || (latin != NULL && longin == NULL))
+	/* civiltime needs longin= but not latin= for non-LL projections -
+	    better would be it just use pj_proj() if it needs those?? */
+    if (latin != NULL && longin == NULL)
 	G_fatal_error(_("Both latin and longin raster maps must be given, or neither"));
 
 /**********end of parser - ******************************/