[GRASS-SVN] r63525 - in grass/branches/releasebranch_7_0: . lib/cairodriver
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 13 06:59:41 PST 2014
Author: martinl
Date: 2014-12-13 06:59:41 -0800 (Sat, 13 Dec 2014)
New Revision: 63525
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/cairodriver/graph.c
Log:
cairodriver: add more debug messages
(merge r63524 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,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,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,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,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515,63524
Modified: grass/branches/releasebranch_7_0/lib/cairodriver/graph.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/cairodriver/graph.c 2014-12-13 14:55:42 UTC (rev 63524)
+++ grass/branches/releasebranch_7_0/lib/cairodriver/graph.c 2014-12-13 14:59:41 UTC (rev 63525)
@@ -67,13 +67,16 @@
G_fatal_error(_("Unable to open display"));
p = getenv("GRASS_RENDER_CAIRO_SCREEN");
- if (!p || sscanf(p, "%i", &scrn) != 1)
+ if (!p || sscanf(p, "%i", &scrn) != 1) {
+ G_debug(1, "cairo: GRASS_RENDER_CAIRO_SCREEN=%s", p);
scrn = DefaultScreen(ca.dpy);
+ }
p = getenv("GRASS_RENDER_CAIRO_VISUAL");
- if (!p || sscanf(p, "%li", &xid) != 1)
+ if (!p || sscanf(p, "%li", &xid) != 1) {
+ G_debug(1, "cairo: GRASS_RENDER_CAIRO_VISUAL=%s", p);
xid = DefaultVisual(ca.dpy, scrn)->visualid;
-
+ }
templ.visualid = xid;
templ.screen = scrn;
@@ -124,7 +127,7 @@
p = getenv("GRASS_RENDER_FILE");
if (!p || strlen(p) == 0)
p = DEFAULT_FILE_NAME;
- G_debug(1, "cairo: GRASS_RENDER_FILE: %s", p);
+ G_debug(1, "cairo: GRASS_RENDER_FILE=%s", p);
ca.file_name = p;
@@ -155,7 +158,7 @@
#endif
else
G_fatal_error(_("Unknown file extension: %s"), p);
- G_debug(1, "File type: %s (%d)", ca.file_name, ca.file_type);
+ G_debug(1, "cairo: file type=%d", ca.file_type);
switch (ca.file_type) {
case FTYPE_PDF:
@@ -170,9 +173,11 @@
p = getenv("GRASS_RENDER_FILE_MAPPED");
do_map = p && strcmp(p, "TRUE") == 0 && ends_with(ca.file_name, ".bmp");
-
+ G_debug(1, "cairo: GRASS_RENDER_FILE_MAPPED=%d", do_map);
+
p = getenv("GRASS_RENDER_FILE_READ");
do_read = p && strcmp(p, "TRUE") == 0;
+ G_debug(1, "cairo: GRASS_RENDER_FILE_READ=%d", do_read);
if (is_vector) {
do_read = do_map = 0;
@@ -234,7 +239,6 @@
char *p;
G_gisinit("Cairo driver");
- G_debug(1, "Cairo_Graph_set");
/* get background color */
p = getenv("GRASS_RENDER_BACKGROUNDCOLOR");
@@ -249,6 +253,7 @@
}
else
G_fatal_error("Unknown background color: %s", p);
+ G_debug(1, "cairo: GRASS_RENDER_BACKGROUNDCOLOR=%s", p);
}
else
ca.bgcolor_r = ca.bgcolor_g = ca.bgcolor_b = 1.0;
@@ -259,7 +264,8 @@
ca.bgcolor_a = 0.0;
else
ca.bgcolor_a = 1.0;
-
+ G_debug(1, "cairo: GRASS_RENDER_TRANSPARENT=%s", p ? p : "FALSE");
+
antialias = CAIRO_ANTIALIAS_DEFAULT;
p = getenv("GRASS_RENDER_ANTIALIAS");
if (p && G_strcasecmp(p, "default") == 0)
@@ -270,7 +276,8 @@
antialias = CAIRO_ANTIALIAS_GRAY;
if (p && G_strcasecmp(p, "subpixel") == 0)
antialias = CAIRO_ANTIALIAS_SUBPIXEL;
-
+ G_debug(1, "cairo: GRASS_RENDER_ANTIALIAS=%s", p ? p : "FALSE");
+
init_file();
cairo_set_antialias(cairo, antialias);
More information about the grass-commit
mailing list