[GRASS-SVN] r41016 -
grass/branches/releasebranch_6_4/imagery/i.ortho.photo/photo.rectify
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Feb 15 02:52:52 EST 2010
Author: hamish
Date: 2010-02-15 02:52:50 -0500 (Mon, 15 Feb 2010)
New Revision: 41016
Modified:
grass/branches/releasebranch_6_4/imagery/i.ortho.photo/photo.rectify/main.c
Log:
check return code (merge from devbr6)
Modified: grass/branches/releasebranch_6_4/imagery/i.ortho.photo/photo.rectify/main.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.ortho.photo/photo.rectify/main.c 2010-02-15 07:41:00 UTC (rev 41015)
+++ grass/branches/releasebranch_6_4/imagery/i.ortho.photo/photo.rectify/main.c 2010-02-15 07:52:50 UTC (rev 41016)
@@ -92,8 +92,10 @@
G_debug(1, "Looking for elevation file in group: <%s>", group.name);
/* get the block elevation layer raster map in target location */
- I_get_group_elev(group.name, elev_layer, mapset_elev, tl, math_exp,
- units, nd);
+ if (!I_get_group_elev(group.name, elev_layer, mapset_elev, tl,
+ math_exp, units, nd))
+ G_fatal_error(_("No target elevation model selected for group <%s>"),
+ group.name);
G_debug(1, "Block elevation: <%s> in <%s>", elev_layer, mapset_elev);
@@ -104,17 +106,17 @@
/** look for camera info for this block **/
if (!I_get_group_camera(group.name, camera))
- G_fatal_error(_("No camera reference file selected for group [%s]"),
+ G_fatal_error(_("No camera reference file selected for group <%s>"),
group.name);
if (!I_get_cam_info(camera, &group.camera_ref))
- G_fatal_error(_("Bad format in camera file for group [%s]"),
+ G_fatal_error(_("Bad format in camera file for group <%s>"),
group.name);
/* get initial camera exposure station, if any */
if (I_find_initial(group.name)) {
if (!I_get_init_info(group.name, &group.camera_exp))
- G_warning(_("Bad format in initial exposusre station file for group [%s]"),
+ G_warning(_("Bad format in initial exposusre station file for group <%s>"),
group.name);
}
More information about the grass-commit
mailing list