[GRASS-SVN] r55168 - grass/trunk/ps/ps.map

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-02-22 03:05:46 -0800 (Fri, 22 Feb 2013)
New Revision: 55168

Modified:
   grass/trunk/ps/ps.map/box.c
   grass/trunk/ps/ps.map/do_grid.c
   grass/trunk/ps/ps.map/do_header.c
   grass/trunk/ps/ps.map/getgrid.c
   grass/trunk/ps/ps.map/map_setup.c
   grass/trunk/ps/ps.map/ps_outline.c
   grass/trunk/ps/ps.map/r_header.c
Log:
stray whitespace (merge from devbr6)

Modified: grass/trunk/ps/ps.map/box.c
===================================================================
--- grass/trunk/ps/ps.map/box.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/box.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -16,7 +16,7 @@
 {
     box_path(t, b, l, r);
     fprintf(PS.fp, "clip newpath\n");
-    
+
     return 0;
 }
 

Modified: grass/trunk/ps/ps.map/do_grid.c
===================================================================
--- grass/trunk/ps/ps.map/do_grid.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/do_grid.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -6,7 +6,6 @@
  */
 #include <string.h>
 #include <math.h>
-
 #include "local_proto.h"
 
 #define LEFT 0

Modified: grass/trunk/ps/ps.map/do_header.c
===================================================================
--- grass/trunk/ps/ps.map/do_header.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/do_header.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <grass/raster.h>
 #include "header.h"
-
 #include "local_proto.h"
 
 static double x, y, dy, fontsize;

Modified: grass/trunk/ps/ps.map/getgrid.c
===================================================================
--- grass/trunk/ps/ps.map/getgrid.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/getgrid.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -60,7 +60,7 @@
 		/* unset_color(&color); */
 		error(key, data, _("Unsupported color request"));
 	    else
-		error(key, data, _("illegal color request")); 
+		error(key, data, _("illegal color request"));
 
 	    continue;
 	}
@@ -170,7 +170,7 @@
 		/* unset_color(&color); */
 		error(key, data, _("Unsupported color request"));
 	    else
-		error(key, data, _("illegal color request")); 
+		error(key, data, _("illegal color request"));
 
 	    continue;
 	}

Modified: grass/trunk/ps/ps.map/map_setup.c
===================================================================
--- grass/trunk/ps/ps.map/map_setup.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/map_setup.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -106,7 +106,7 @@
 
     /* save original graphics state */
     fprintf(PS.fp, "gsave ");
-    
+
     /* compute conversion factor from meters to PostScript window coordinates */
     /*
        G_begin_distance_calculations();

Modified: grass/trunk/ps/ps.map/ps_outline.c
===================================================================
--- grass/trunk/ps/ps.map/ps_outline.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/ps_outline.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -86,7 +86,7 @@
 		/* unset_color(&color); */
 		error(key, data, _("Unsupported color request"));
 	    else
-		error(key, data, _("illegal color request")); 
+		error(key, data, _("illegal color request"));
 
 	    continue;
 	}
@@ -106,6 +106,7 @@
 
 	error(key, data, _("illegal outline sub-request"));
     }
+
     PS.outline_color = color;
     PS.do_outline = 1;
 

Modified: grass/trunk/ps/ps.map/r_header.c
===================================================================
--- grass/trunk/ps/ps.map/r_header.c	2013-02-22 11:02:37 UTC (rev 55167)
+++ grass/trunk/ps/ps.map/r_header.c	2013-02-22 11:05:46 UTC (rev 55168)
@@ -58,13 +58,13 @@
 
 	if (KEY("color")) {
 	    ret = G_str_to_color(data, &r, &g, &b);
-            if (ret == 1)
-                set_color(&color, r, g, b);
-            else if (ret == 2)  /* i.e. "none" */
-                /* unset_color(&color); */
-                error(key, data, _("Unsupported color request"));
-            else
-                error(key, data, _("illegal color request")); 
+	    if (ret == 1)
+		set_color(&color, r, g, b);
+	    else if (ret == 2)  /* i.e. "none" */
+		/* unset_color(&color); */
+		error(key, data, _("Unsupported color request"));
+	    else
+		error(key, data, _("illegal color request"));
 
 	    continue;
 	}