[GRASS-SVN] r63753 - in grass/branches/releasebranch_7_0: . lib/display lib/init
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 25 05:56:22 PST 2014
Author: martinl
Date: 2014-12-25 05:56:22 -0800 (Thu, 25 Dec 2014)
New Revision: 63753
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/display/r_raster.c
grass/branches/releasebranch_7_0/lib/init/variables.html
Log:
Check for either MONITOR or GRASS_RENDER_IMMEDIATE
(merge r63361,63742,63747-63748,63751-63752)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718,63721
-63727,63731,63733,63749
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63742,63747-63749,63751-63752
Modified: grass/branches/releasebranch_7_0/lib/display/r_raster.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/display/r_raster.c 2014-12-25 13:04:09 UTC (rev 63752)
+++ grass/branches/releasebranch_7_0/lib/display/r_raster.c 2014-12-25 13:56:22 UTC (rev 63753)
@@ -3,7 +3,7 @@
\brief Display Library - Raster graphics subroutines
- (C) 2001-2009, 2011 by the GRASS Development Team
+ (C) 2001-2014 by the GRASS Development Team
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
@@ -71,6 +71,8 @@
FILE *fd;
char buf[1024];
char **token;
+
+ G_debug(1, "read_env_file(): %s", path);
fd = fopen(path, "r");
if (!fd)
@@ -101,6 +103,7 @@
int D_open_driver(void)
{
const char *p, *m;
+ const struct driver *drv;
G_debug(1, "D_open_driver():");
p = getenv("GRASS_RENDER_IMMEDIATE");
@@ -109,7 +112,8 @@
if (m && G_strncasecmp(m, "wx", 2) == 0) {
/* wx monitors always use GRASS_RENDER_IMMEDIATE. */
p = NULL; /* use default display driver */
- } else if (m) {
+ }
+ else if (m) {
char *env;
const char *v;
char *u_m;
@@ -133,8 +137,14 @@
if (v)
read_env_file(v);
}
+ else if (!p)
+ G_fatal_error(_("Neither %s (managed by d.mon command) nor %s (used for direct rendering) defined"),
+ "MONITOR", "GRASS_RENDER_IMMEDIATE");
+
+ if (p && G_strcasecmp(p, "default") == 0)
+ p = NULL;
- const struct driver *drv =
+ drv =
(p && G_strcasecmp(p, "png") == 0) ? PNG_Driver() :
(p && G_strcasecmp(p, "ps") == 0) ? PS_Driver() :
(p && G_strcasecmp(p, "html") == 0) ? HTML_Driver() :
@@ -152,9 +162,6 @@
init();
- if (!getenv("GRASS_RENDER_IMMEDIATE") && !m)
- return 1;
-
return 0;
}
Modified: grass/branches/releasebranch_7_0/lib/init/variables.html
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/variables.html 2014-12-25 13:04:09 UTC (rev 63752)
+++ grass/branches/releasebranch_7_0/lib/init/variables.html 2014-12-25 13:56:22 UTC (rev 63753)
@@ -329,15 +329,20 @@
<h3>List of selected GRASS environment variables for rendering</h3>
<blockquote>
-[ In addition to those which are understood by specific <em>GRASS display
- drivers</em>, the following variables affect rendering. ]
+[ In addition to those which are understood by
+ specific <em><a href="displaydrivers.html">GRASS display
+ drivers</a></em>, the following variables affect rendering. ]
</blockquote>
<dl>
<dt>GRASS_RENDER_IMMEDIATE</dt>
<dd>tells the display library which driver to use; possible
- values: <em><a href="cairodriver.html">cairo</a></em>, <em><a href="pngdriver.html">png</a></em>, <em><a href="psdriver.html">ps</a></em>
- or <em><a href="htmldriver.html">html</a></em></dd>
+ values: <em><a href="cairodriver.html">cairo</a></em>, <em><a href="pngdriver.html">png</a></em>, <em><a href="psdriver.html">ps</a></em>,
+ <em><a href="htmldriver.html">html</a></em>
+ or <em>default</em><br>Default display driver
+ is <em><a href="cairodriver.html">cairo</a></em> (if available)
+ otherwise <em><a href="pngdriver.html">png</a></em>.
+ </dd>
<dt>GRASS_RENDER_WIDTH</dt>
<dd>defines the width of output image (default is 640).</dd>
More information about the grass-commit
mailing list