[GRASS-SVN] r62458 - grass/branches/releasebranch_7_0/display/d.colors

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-10-28 16:00:56 -0700 (Tue, 28 Oct 2014)
New Revision: 62458

Modified:
   grass/branches/releasebranch_7_0/display/d.colors/Makefile
   grass/branches/releasebranch_7_0/display/d.colors/curses.c
   grass/branches/releasebranch_7_0/display/d.colors/get_info.c
   grass/branches/releasebranch_7_0/display/d.colors/interact.c
   grass/branches/releasebranch_7_0/display/d.colors/main.c
   grass/branches/releasebranch_7_0/display/d.colors/tbl_toggle.c
Log:
d.colors: some (useless?) updates

Modified: grass/branches/releasebranch_7_0/display/d.colors/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/Makefile	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/Makefile	2014-10-28 23:00:56 UTC (rev 62458)
@@ -2,8 +2,8 @@
 
 PGM = d.colors
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(CURSES)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(CURSES)
+DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(CURSESDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/branches/releasebranch_7_0/display/d.colors/curses.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/curses.c	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/curses.c	2014-10-28 23:00:56 UTC (rev 62458)
@@ -1,6 +1,7 @@
 #include <curses.h>
 #include <grass/gis.h>
 #include <grass/colors.h>
+#include <grass/raster.h>
 
 
 /*               " <------------ Room for text --------------> " */

Modified: grass/branches/releasebranch_7_0/display/d.colors/get_info.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/get_info.c	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/get_info.c	2014-10-28 23:00:56 UTC (rev 62458)
@@ -26,8 +26,5 @@
 
     interact(&categories, &colors, name, mapset);
 
-    /* Wrapup graphics */
-    R_flush();
-
     return 0;
 }

Modified: grass/branches/releasebranch_7_0/display/d.colors/interact.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/interact.c	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/interact.c	2014-10-28 23:00:56 UTC (rev 62458)
@@ -57,7 +57,6 @@
     /*  mark_category(at_cat, 1) ; */
 
     while (1) {
-	R_flush();
 	cur_char = getchar() & 0177;
 	sprintf(buffer, "  %c", cur_char);
 	Write_message(2, buffer);

Modified: grass/branches/releasebranch_7_0/display/d.colors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/main.c	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/main.c	2014-10-28 23:00:56 UTC (rev 62458)
@@ -1,4 +1,3 @@
-
 /****************************************************************************
  *
  * MODULE:       d.colors
@@ -20,6 +19,7 @@
 #include <grass/gis.h>
 #include <grass/glocale.h>
 #include <grass/display.h>
+#include <grass/raster.h>
 #include "colors.h"
 
 int main(int argc, char **argv)
@@ -78,7 +78,7 @@
     }
 
     /* connect to the driver */
-    if (R_open_driver() != 0)
+    if (D_open_driver() != 0)
 	G_fatal_error("No graphics device selected");
 
     /* Read in the map region associated with graphics window */
@@ -86,6 +86,6 @@
 
     get_map_info(map->answer, mapset);
 
-    R_close_driver();
+    D_close_driver();
     exit(0);
 }

Modified: grass/branches/releasebranch_7_0/display/d.colors/tbl_toggle.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colors/tbl_toggle.c	2014-10-28 22:58:33 UTC (rev 62457)
+++ grass/branches/releasebranch_7_0/display/d.colors/tbl_toggle.c	2014-10-28 23:00:56 UTC (rev 62458)
@@ -1,4 +1,5 @@
 #include <grass/gis.h>
+#include <grass/raster.h>
 #include "colors.h"
 
 static int toggle_number;