[GRASS-SVN] r63836 - in grass/branches/releasebranch_7_0: . display/d.geodesic display/d.rhumbline general/g.setproj include/defs lib/gis lib/raster lib/vector/Vlib
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 10:49:58 PST 2014
Author: martinl
Date: 2014-12-29 10:49:58 -0800 (Mon, 29 Dec 2014)
New Revision: 63836
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.geodesic/main.c
grass/branches/releasebranch_7_0/display/d.rhumbline/main.c
grass/branches/releasebranch_7_0/general/g.setproj/main.c
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/gis/proj2.c
grass/branches/releasebranch_7_0/lib/gis/proj3.c
grass/branches/releasebranch_7_0/lib/raster/open.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c
Log:
libgis: G__projection_units() -> G_projection_units()
G__projection_name() -> G_projection_name()
(merge r63834-5 from trunk)
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,63361-63363,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,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831
+ /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-63363,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,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835
Modified: grass/branches/releasebranch_7_0/display/d.geodesic/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.geodesic/main.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/display/d.geodesic/main.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -76,7 +76,7 @@
if (G_projection() != PROJECTION_LL)
G_fatal_error(_("Location is not %s"),
- G__projection_name(PROJECTION_LL));
+ G_projection_name(PROJECTION_LL));
/* get conversion factor and unit name */
unit_id = G_units(parm.units->answer);
Modified: grass/branches/releasebranch_7_0/display/d.rhumbline/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rhumbline/main.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/display/d.rhumbline/main.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -73,7 +73,7 @@
if (G_projection() != PROJECTION_LL)
G_fatal_error(_("Location is not %s"),
- G__projection_name(PROJECTION_LL));
+ G_projection_name(PROJECTION_LL));
#ifdef CAN_DO_DISTANCES
/* get conversion factor and unit name */
Modified: grass/branches/releasebranch_7_0/general/g.setproj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -161,19 +161,19 @@
}
case PROJECTION_UTM:
if (!exist) {
- sprintf(proj_name, "%s", G__projection_name(PROJECTION_UTM));
+ sprintf(proj_name, "%s", G_projection_name(PROJECTION_UTM));
sprintf(proj_out, "utm");
break;
}
case PROJECTION_SP:
if (!exist) {
- sprintf(proj_name, "%s", G__projection_name(PROJECTION_SP));
+ sprintf(proj_name, "%s", G_projection_name(PROJECTION_SP));
sprintf(proj_out, "stp");
break;
}
case PROJECTION_LL:
if (!exist) {
- sprintf(proj_name, "%s", G__projection_name(PROJECTION_LL));
+ sprintf(proj_name, "%s", G_projection_name(PROJECTION_LL));
sprintf(proj_out, "ll");
break;
}
Modified: grass/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 18:49:58 UTC (rev 63836)
@@ -575,8 +575,8 @@
int G_projection(void);
/* proj2.c */
-int G__projection_units(int);
-const char *G__projection_name(int);
+int G_projection_units(int);
+const char *G_projection_name(int);
/* proj3.c */
const char *G_database_unit_name(int);
Modified: grass/branches/releasebranch_7_0/lib/gis/proj2.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/proj2.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/lib/gis/proj2.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -29,7 +29,7 @@
\return units code (see gis.h)
\return U_UNDEFINED if not defined
*/
-int G__projection_units(int n)
+int G_projection_units(int n)
{
switch (n) {
case PROJECTION_XY:
@@ -52,7 +52,7 @@
\return projection name
\return NULL on error
*/
-const char *G__projection_name(int n)
+const char *G_projection_name(int n)
{
switch (n) {
case PROJECTION_XY:
Modified: grass/branches/releasebranch_7_0/lib/gis/proj3.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/proj3.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/lib/gis/proj3.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -52,7 +52,7 @@
int units;
const char *name;
- units = G__projection_units(G_projection());
+ units = G_projection_units(G_projection());
if (units == U_UNDEFINED) {
name = lookup_units(plural ? "units" : "unit");
@@ -102,7 +102,7 @@
case PROJECTION_XY:
case PROJECTION_UTM:
case PROJECTION_LL:
- return G__projection_name(n);
+ return G_projection_name(n);
}
name = lookup_proj("name");
Modified: grass/branches/releasebranch_7_0/lib/raster/open.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/open.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/lib/raster/open.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -219,8 +219,8 @@
G_fatal_error(_("Raster map <%s> is in different projection than current region. "
"Found <%s>, should be <%s>."),
G_fully_qualified_name(name, mapset),
- G__projection_name(cellhd.proj),
- G__projection_name(R__.rd_window.proj));
+ G_projection_name(cellhd.proj),
+ G_projection_name(R__.rd_window.proj));
if (cellhd.zone != R__.rd_window.zone)
G_fatal_error(_("Raster map <%s> is in different zone (%d) than current region (%d)"),
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c 2014-12-29 18:47:26 UTC (rev 63835)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c 2014-12-29 18:49:58 UTC (rev 63836)
@@ -539,7 +539,7 @@
case PROJECTION_XY:
case PROJECTION_UTM:
case PROJECTION_LL:
- return G__projection_name(n);
+ return G_projection_name(n);
case PROJECTION_OTHER:
/* this won't protect against differing "other" projections, so
better to just include P_OTHER in the above list so we return the
More information about the grass-commit
mailing list