Bug?:
r.mapcalc pok1=-6.0
echo -e "-10.1 green\n-5 green\n-5 blue\n10 blue" | r.colors map=pok1 color=rules
r.mapcalc pok2="int(pok1)"
r.colors map=pok2 rast=pok1
d.rast map=pok2 ---> blue!!!
Ra
Radim Blazek wrote:
Bug?:
Yep. In libgis.
r.mapcalc pok1=-6.0
echo -e "-10.1 green\n-5 green\n-5 blue\n10 blue" | r.colors map=pok1 color=rules
r.mapcalc pok2="int(pok1)"
r.colors map=pok2 rast=pok1
d.rast map=pok2 ---> blue!!!
It's due to an inconsistency in the convertion of negative FP values
to integers. organize_lookup() in color_org.c simply truncates:
121: x = (CELL ) cp->min;
while G__lookup_colors() in color_look.c uses floor():
156: dmin = cp->min;
157: dmax = cp->max;
158: min = floor(dmin);
Truncating rounds towards zero, while floor() rounds downwards
(towards minus infinity), so if cp->min is -10.1, truncating gives -10
while floor gives -11. This causes lookups in cp->lookup.{red,grn,blu}
to be off by one.
Try the attached patch.
--
Glynn Clements <glynn.clements@virgin.net>
(attachments)
color_look.c.patch (350 Bytes)
On Tuesday 26 August 2003 02:52, Glynn Clements wrote:
Radim Blazek wrote:
> Bug?:Yep. In libgis.
> r.mapcalc pok1=-6.0
> echo -e "-10.1 green\n-5 green\n-5 blue\n10 blue" | r.colors map=pok1
> color=rules r.mapcalc pok2="int(pok1)"
> r.colors map=pok2 rast=pok1
> d.rast map=pok2 ---> blue!!!It's due to an inconsistency in the convertion of negative FP values
to integers. organize_lookup() in color_org.c simply truncates:121: x = (CELL ) cp->min;
while G__lookup_colors() in color_look.c uses floor():
156: dmin = cp->min;
157: dmax = cp->max;
158: min = floor(dmin);Truncating rounds towards zero, while floor() rounds downwards
(towards minus infinity), so if cp->min is -10.1, truncating gives -10
while floor gives -11. This causes lookups in cp->lookup.{red,grn,blu}
to be off by one.Try the attached patch.
OK, are you going to submit it to CVS?
Ra
On Tue, Aug 26, 2003 at 09:42:22AM +0200, Radim Blazek wrote:
On Tuesday 26 August 2003 02:52, Glynn Clements wrote:
> Radim Blazek wrote:
> > Bug?:
>
> Yep. In libgis.
>
> > r.mapcalc pok1=-6.0
> > echo -e "-10.1 green\n-5 green\n-5 blue\n10 blue" | r.colors map=pok1
> > color=rules r.mapcalc pok2="int(pok1)"
> > r.colors map=pok2 rast=pok1
> > d.rast map=pok2 ---> blue!!!
>
> It's due to an inconsistency in the convertion of negative FP values
> to integers. organize_lookup() in color_org.c simply truncates:
>
> 121: x = (CELL ) cp->min;
>
>
> while G__lookup_colors() in color_look.c uses floor():
>
> 156: dmin = cp->min;
> 157: dmax = cp->max;
> 158: min = floor(dmin);
>
> Truncating rounds towards zero, while floor() rounds downwards
> (towards minus infinity), so if cp->min is -10.1, truncating gives -10
> while floor gives -11. This causes lookups in cp->lookup.{red,grn,blu}
> to be off by one.
>
> Try the attached patch.OK, are you going to submit it to CVS?
If yes, should it go into the release branch?
If possible, I would like to release 5.0.3 tomorrow or
Thursday latest (then I am out of town for more than a week).
Markus
Markus Neteler wrote:
> OK, are you going to submit it to CVS?
Yes.
If yes, should it go into the release branch?
Yes, once we're satisfied that it's correct.
If possible, I would like to release 5.0.3 tomorrow or
Thursday latest (then I am out of town for more than a week).
I'd like more time to look at the changes. Note that nobody has posted
a comprehensive summary of what's actually changed. I'm fairly sure
that some of those changes don't belong in the release branch (e.g.
Mike's MinGW stuff in src/general/init/chk_dbase.c, possibly
elsewhere).
--
Glynn Clements <glynn.clements@virgin.net>
I'd like more time to look at the changes. Note that nobody has posted
a comprehensive summary of what's actually changed.
How is this done?
tools/diff.sh gives a list of changed files between two source files;
cvs2cl.pl will give a changelog between two CVS tags, but as far as I
can tell 5.0.2 and 5.0.3 share the same CVS tag, so it won't work.
So how to make a cvs comments changelog between 5.0.2 and 5.0.3 with the
same tag? Checking each filename in the CVS-web interface is too long a
job for the many changes. Can cvs2cl.pl work by date+tag?
?
Hamish
On Wed, Aug 27, 2003 at 05:43:29AM +0100, Glynn Clements wrote:
Markus Neteler wrote:
> > OK, are you going to submit it to CVS?
Yes.
> If yes, should it go into the release branch?
Yes, once we're satisfied that it's correct.
> If possible, I would like to release 5.0.3 tomorrow or
> Thursday latest (then I am out of town for more than a week).I'd like more time to look at the changes. Note that nobody has posted
a comprehensive summary of what's actually changed. I'm fairly sure
that some of those changes don't belong in the release branch (e.g.
Mike's MinGW stuff in src/general/init/chk_dbase.c, possibly
elsewhere).
No problem to wait. I would appreciate if the changes get reviewed.
Markus
On Wed, 27 Aug 2003, Hamish wrote:
> I'd like more time to look at the changes. Note that nobody has posted
> a comprehensive summary of what's actually changed.How is this done?
tools/diff.sh gives a list of changed files between two source files;
cvs2cl.pl will give a changelog between two CVS tags, but as far as I
can tell 5.0.2 and 5.0.3 share the same CVS tag, so it won't work.So how to make a cvs comments changelog between 5.0.2 and 5.0.3 with the
same tag? Checking each filename in the CVS-web interface is too long a
job for the many changes. Can cvs2cl.pl work by date+tag?
cvs2cl.pl -F releasebranch_26_april_2002_5_0_0 --delta \
release_10_04_2003_grass5_0_2:releasebranch_26_april_2002_5_0_0
seems to work (see below). I'm not sure it's that useful though; most
of the comments just say 'sync with HEAD' or something similar
Paul
2003-08-26 17:41 markus
* AUTHORS: sync with HEAD
2003-08-26 08:03 markus
* html/html/: shade.clr.sh.html, shade.rel.sh.html: sync'ed with
HEAD
2003-08-25 15:37 markus
* src/libes/proj/doc/: OF90-284.pdf, PROJ.4.3.I2.pdf, PROJ.4.3.pdf,
SWISS.pdf, wwwlinks.txt: removed large files OF90-284.pdf
PROJ.4.3.I2.pdf PROJ.4.3.pdf SWISS.pdf (available from
http://www.remotesensing.org/proj/
2003-08-25 14:48 markus
* NEWS.html: added shade.cls.sh fix from Hamish
2003-08-25 14:12 markus
* src/scripts/shells/shade.clr.sh: sync'ed from HEAD
2003-08-25 13:07 paul
* src/misc/m.kappa/cmd/prt_hdr.c: Fix bug 2076 (reported by Stefano
Perona)
2003-08-25 12:39 markus
* src.garden/grass.postgresql/g.stats.pg/infxStats.c: fixed compile
problem on Debian
2003-08-25 08:53 markus
* src.garden/grass.postgresql/g.column.pg/main.c: hopefully fixed
2003-08-25 08:49 markus
* html/html/: d.rgb.html, r.composite.html: sync with HEAD
2003-08-25 08:48 markus
* html/html/d.where.html: reverted wrong sync
2003-08-25 08:42 markus
* src/tcltkgrass/module/d.barscale, html/html/d.barscale.html: sync
with HEAD
2003-08-25 08:33 markus
* src/display/devices/PNGdriver/Gmakefile: sync with HEAD
2003-08-24 17:54 markus
* NEWS.html: updated
2003-08-24 17:47 markus
* src/display/d.barscale/cmd/main.c: fixed patch
2003-08-22 09:55 markus
* src.garden/grass.postgresql/g.select.pg/main.c:
G_unsetenv(PG_HOST); fix sync'ed with HEAD
2003-08-20 15:28 markus
* NEWS.html: updated, not yet complete - please add
2003-08-20 15:08 paul
* src/raster/r.in.gdal/: Gmakefile, main.c: New proj-related
changes reverted
2003-08-20 14:29 markus
* html/html/s.cellstats.html: added output of number of sites and
sum
2003-08-20 14:21 markus
* html/sites.html: s.cellstats added
2003-08-20 14:17 markus
* src/raster/r.fill.dir/ppupdate.c: Sync with HEAD
2003-08-20 14:13 markus
* src/: raster/r.profile/cmd/main.c, mapdev/v.digit/node_lines.c:
Sync with HEAD
2003-08-20 14:10 markus
* src/: ps.map/ps.map/cmd/do_labels.c,
ps.map/ps.map/cmd/ps_fclrtbl.c, ps.map/ps.map/cmd/ps_map.c,
ps.map/scripts/demo1.scr, ps.map/scripts/demo2.scr,
ps.map/scripts/demo3.scr, ps.map/scripts/demo5.scr,
ps.map/scripts/demo8.scr, ps.map/scripts/demo9.scr,
raster/r.transect/cmd/main.c: Sync with HEAD
2003-08-20 10:40 markus
* src/raster/wildfire/src/r.spread/local_proto.h: Sync to release
branch
2003-08-20 10:35 markus
* Makefile.in, NEWS.html,
src/imagery/i.ortho.photo/libes/Gmakefile,
src/mapdev/v.build/main.c, src/mapdev/v.digit/set_thresh.c,
src/mapdev/v.in.dgn/Gmakefile, src/mapdev/v.in.dgn/README,
src/mapdev/v.in.dgn/main.c, src/mapdev/v.in.mif/main.c,
src/mapdev/v.in.mif/write_lines.c, src/mapdev/v.in.shape/lines.c,
src/mapdev/v.in.shape/vmap_import.c,
src/mapdev/v.mkquads/ask_for.c,
src/mapdev/v.mkquads/calc_quads.c,
src/mapdev/v.out.e00/v.out.e00.c, src/mapdev/v.timestamp/main.c,
src/misc/m.in.e00/info.c, src/misc/m.kappa/cmd/main.c,
src/misc/m.kappa/cmd/prt_hdr.c,
src/misc/m.kappa/cmd/readin_data.c,
src/ps.map/devices/ps.devices/a3,
src/ps.map/devices/ps.devices/a4,
src/raster/r.colors/cmd/local_proto.h,
src/raster/r.colors/cmd/main.c, src/raster/r.colors/cmd/rules.c,
src/raster/r.cost/cmd/btree.c, src/raster/r.cost/cmd/main.c,
src/raster/r.cost/cmd/stash.h, src/raster/r.his/cmd/main.c,
src/raster/r.in.doq/cmd/get_newhead.c,
src/raster/r.in.gdal/Gmakefile,
src/raster/r.in.gdal/gbgetsymbol.c,
src/raster/r.in.gdal/gdalbridge.c,
src/raster/r.in.gdal/gdalbridge.h, src/raster/r.in.gdal/main.c,
src/raster/r.info/inter/main.c,
src/raster/r.info/inter/more_print.c,
src/raster/r.los/cmd/delete.c, src/raster/r.los/cmd/main.c,
src/raster/r.los/cmd/mark_pts.c, src/raster/r.los/cmd/pts_elim.c,
src/raster/r.mapcalc3/evaluate.c,
src/raster/r.mapcalc3/expression.c,
src/raster/r.patch/cmd/main.c, src/raster/r.patch/cmd/nfiles.h,
src/raster/r.reclass/cmd/reclass.c,
src/raster/r.timestamp/main.c,
src/raster/wildfire/src/r.ros/spot_dist.c,
src/raster/wildfire/src/r.spread/cell_ptrHa.h,
src/raster/wildfire/src/r.spread/cmd_line.h,
src/raster/wildfire/src/r.spread/collect_ori.c,
src/raster/wildfire/src/r.spread/costHa.h,
src/raster/wildfire/src/r.spread/deleteHa.c,
src/raster/wildfire/src/r.spread/display.c,
src/raster/wildfire/src/r.spread/fixHa.c,
src/raster/wildfire/src/r.spread/get_minHa.c,
src/raster/wildfire/src/r.spread/insert2Ha.c,
src/raster/wildfire/src/r.spread/insertHa.c,
src/raster/wildfire/src/r.spread/main.c,
src/raster/wildfire/src/r.spread/pick_dist.c,
src/raster/wildfire/src/r.spread/pick_ignite.c,
src/raster/wildfire/src/r.spread/ram2out.c,
src/raster/wildfire/src/r.spread/replaceHa.c,
src/raster/wildfire/src/r.spread/select_linksB.c,
src/raster/wildfire/src/r.spread/spot.c,
src/raster/wildfire/src/r.spread/spread.c,
src/scripts/contrib/d.rast.labels/d.rast.labels,
src/scripts/contrib/d.rast.leg/d.rast.leg,
src/scripts/contrib/grassmirrorsmap/grass.sites.main,
src/scripts/contrib/grassmirrorsmap/grass.sites.mirror,
src/scripts/contrib/grassmirrorsmap/grass_sites.gif,
src/scripts/contrib/grassmirrorsmap/grass_sites.htmlmap,
src/scripts/contrib/grassmirrorsmap/grassmap.html,
src/scripts/contrib/grassmirrorsmap/mkgrassmap.sh,
src/scripts/contrib/r.fillnulls/r.fillnulls,
src/scripts/contrib/r.to.pg/r.to.pg,
src/scripts/contrib/s.in.atkisdgm/s.in.atkisdgm,
src/scripts/contrib/s.in.atkisdgm/s.in.atkisktb,
src/scripts/contrib/s.in.garmin.sh/s.in.garmin.sh,
src/scripts/contrib/v.cutregion.sh/v.cutregion.sh,
src/scripts/contrib/v.in.garmin.sh/v.in.garmin.sh,
src/scripts/contrib/v.in.mapgen.sh/v.in.mapgen.sh,
src/scripts/contrib/v.line2area/v.area2line,
src/scripts/contrib/v.line2area/v.line2area,
src/scripts/contrib/v.region.sh/v.region.sh,
src/scripts/shells/slide.show.sh, src/sites/s.cellstats/main.c,
src/sites/s.cellstats/univar.c, src/sites/s.cellstats/univar.h,
src/sites/s.in.ascii/get_site.c, src/sites/s.in.ascii/main.c,
src/sites/s.in.dbf/main.c, src/sites/s.out.ascii/main.c,
src/sites/s.qcount/main.c, src/sites/s.qcount/tutorial/output,
src/sites/s.windavg/main.c, src/tcltkgrass/main/gis_set.tcl,
src/tcltkgrass/module/d.barscale, src/tcltkgrass/module/d.grid,
src/tcltkgrass/module/r.proj, src/tcltkgrass/module/r.transect,
tools/diff.sh: Sync to release branch
2003-08-20 09:53 markus
* src/libes/gis/sleep.c: Sync to release branch
2003-08-20 09:47 markus
* src/general/: init/Gmakefile, init/README, init/chk_dbase.c,
init/grass.src, init/grass_intro.txt, init/init.sh,
init/mke_loc.c, init/mke_mapset.c, init/set_data.c,
g.ask/cmd/main.c, g.filename/cmd/main.c, g.findfile/cmd/main.c,
g.gisenv/main.c: Sync to release branch
2003-08-20 09:35 markus
* src/fonts/for_grass/splitfont.c,
src.garden/grass.postgresql/tutorial/index.html: Sync to release
branch
2003-08-20 09:31 markus
* src/: display/d.leg.thin/main.c, display/d.what.sites/main.c,
fonts/fonts/cyrilc.hmp: Sync to release branch
2003-08-20 09:28 markus
* src/display/: d.area/screenpoly.h,
devices/windows/libW11/w32/xlib.c, d.geodesic/cmd/Gmakefile: Sync
to release branch
2003-08-20 09:19 markus
* src/CMD/: VERSION, lists/GRASS: Sync to release branch
2003-08-20 09:16 markus
* src/: display/d.barscale/cmd/draw_scale.c,
display/d.barscale/cmd/main.c, display/d.barscale/cmd/mouse.c,
display/d.barscale/cmd/options.h, general/g.parser/test.sh: Sync
to release branch
2003-08-20 09:10 markus
* aclocal.m4, documents/cygwin_grass50bininstall.html,
documents/release_rules.txt, documents/sites_format50.txt,
html/raster.html, html/sites.html, html/html/d.barscale.html,
html/html/d.colormode.html, html/html/d.colors.html,
html/html/d.colortable.html, html/html/d.rgb.html,
html/html/d.save.html, html/html/d.site.labels.html,
html/html/d.site.pg.html, html/html/d.sites.label.html,
html/html/d.where.html, html/html/r.fill.dir.html,
html/html/r.sun.html, html/html/s.in.ascii.html,
html/html/s.in.dbf.html, html/html/s.in.shape.html,
html/html/s.surf.idw.html, html/html/s.vol.rst.html,
html/html/s.voronoi.html, html/html/shade.rel.sh.html,
html/html/v.build.polylines.html, html/html/v.extract.html,
html/html/v.import.html, html/html/v.in.gshhs.html,
html/html/v.mkquads.html, html/html/v.spag.html: Sync to release
branch
2003-08-20 08:57 markus
* src/scripts/shells/shade.rel.sh: Sync with HEAD
2003-08-08 16:41 paul
* src/libes/proj/do_proj_nad.c: Bugfix to old datum shifting for
releasebranch
2003-07-10 08:24 markus
* src/general/g.mapsets/main_cmd.c: fix typo bug: #2011
2003-07-04 09:35 markus
* html/html/: g.findfile.html, r.cost.html, r.flow.html,
r.flowmd.html, r.in.ascii.html, r.in.poly.html, s.buffer.html,
s.kernel.html, v.bubble.html, v.circle.html: sync'ed with HEAD
2003-06-11 12:25 paul
* src/raster/r.in.gdal/main.c: Important bugfix (for correct
PROJ_INFO files) added to release branch
2003-05-29 12:19 markus
* src/sites/s.in.dbf/dump.c: buffer enlarged (bug #1891)
2003-05-08 15:16 markus
* src/sites/s.out.e00/s.out.e00.c: sync with HEAD
2003-05-07 08:23 markus
* src/raster/r.statistics/cmd/method.h: sync with HEAD
2003-05-06 17:23 markus
* src/raster/r.topmodel/main.c: sync with HEAD
2003-05-06 15:50 markus
* src/raster/: r.profile/cmd/main.c, r.quant/main.c: sync with HEAD
2003-05-06 15:37 markus
* src/raster/r.tiff/r.out.tiff.c: sync with HEAD
2003-05-06 14:33 markus
* src/raster/r.in.bin/main.c, html/html/r.info.html: sync with HEAD
2003-05-06 09:05 markus
* src/raster/r.thin/cmd/size.c: sync with HEAD
2003-05-06 09:01 markus
* src/raster/r.statistics/cmd/: median.c, method.h, moment.c,
skew.c: sync with head
2003-05-06 09:00 markus
* src/raster/r.statistics/cmd/unused/: median.c, moment.c, skew.c:
sync with HEAD
2003-05-06 08:55 markus
* src/raster/r.patch/cmd/: Gmakefile, patch.c: sync with HEAD
2003-05-06 08:52 markus
* src/raster/wildfire/src/r.spread/prob_invsqr.c: moved to
prob_invsqr/ to avoid 5.1 conflict with two main()
2003-05-06 08:51 markus
* src/raster/wildfire/src/r.spread/prob_invsqr/prob_invsqr.c: moved
here from ../ for 5.1
2003-05-06 08:37 markus
* src/raster/r.los/cmd/newsegment.c: removed leftover file
2003-05-06 08:23 markus
* src/raster/r.coin/cmd/: Gmakefile, cmd.c, cmd_parms.c: sync with
HEAD
2003-04-29 18:27 markus
* src/display/d.barscale/cmd/main.c: sync'ed with HEAD
2003-04-24 09:51 markus
* src.contrib/GMSL/NVIZ2.2/src/interface.h: added TK8.4 fix from
HEAD
2003-04-18 13:37 markus
* src/general/g.parser/test.sh: sync with HEAD
2003-04-18 09:58 markus
* html/html/r.colors.html: sync with HEAD
2003-04-16 09:01 markus
* src/imagery/i.class/draw_match.c: sync with head
2003-04-11 15:05 radim
* src/mapdev/v.to.db/parse.c: vector option
2003-04-11 08:35 markus
* NEWS.html: fix
On Wed, Aug 27, 2003 at 12:25:55PM +0100, Paul Kelly wrote:
On Wed, 27 Aug 2003, Hamish wrote:
> > I'd like more time to look at the changes. Note that nobody has posted
> > a comprehensive summary of what's actually changed.
>
> How is this done?
> tools/diff.sh gives a list of changed files between two source files;
> cvs2cl.pl will give a changelog between two CVS tags, but as far as I
> can tell 5.0.2 and 5.0.3 share the same CVS tag, so it won't work.
>
> So how to make a cvs comments changelog between 5.0.2 and 5.0.3 with the
> same tag? Checking each filename in the CVS-web interface is too long a
> job for the many changes. Can cvs2cl.pl work by date+tag?cvs2cl.pl -F releasebranch_26_april_2002_5_0_0 --delta \
release_10_04_2003_grass5_0_2:releasebranch_26_april_2002_5_0_0seems to work (see below). I'm not sure it's that useful though; most
of the comments just say 'sync with HEAD' or something similar
To compare 5.0.2 to the current release_branch, run
(inside the fresh release_branch releasebranch_26_april_2002_5_0_0):
cvs diff -u -r release_10_04_2003_grass5_0_2
NB: The chk_dbase.c / __MINGW32__ change I have reverted.
Markus
Hamish wrote:
> I'd like more time to look at the changes. Note that nobody has posted
> a comprehensive summary of what's actually changed.How is this done?
tools/diff.sh gives a list of changed files between two source files;
cvs2cl.pl will give a changelog between two CVS tags, but as far as I
can tell 5.0.2 and 5.0.3 share the same CVS tag, so it won't work.
5.0.2 has a non-branch tag (release_10_04_2003_grass5_0_2); 5.0.3
corresponds to the latest version of the release branch (i.e the
releasebranch_26_april_2002_5_0_0 branch tag).
--
Glynn Clements <glynn.clements@virgin.net>
Markus Neteler wrote:
> > If possible, I would like to release 5.0.3 tomorrow or
> > Thursday latest (then I am out of town for more than a week).
>
> I'd like more time to look at the changes. Note that nobody has posted
> a comprehensive summary of what's actually changed. I'm fairly sure
> that some of those changes don't belong in the release branch (e.g.
> Mike's MinGW stuff in src/general/init/chk_dbase.c, possibly
> elsewhere).No problem to wait. I would appreciate if the changes get reviewed.
A few more issues:
1. src/tcltkgrass/module/d.grid has been updated for the bordercolor=
option and -b/-g flags, but these aren't in the release version of
d.grid itself. Which one is wrong?
2. The src/tcltkgrass/module/r.proj update introduced a typo:
{checkbox -n {Do not preform region cropping optimization} "" -n}
I've fixed this one in both head and release branch.
3. The signal handling changes in
src/general/init/grass.src
src/general/init/init.sh
prevent trapping SIGKILL (9) and SIGTERM (15). Not trapping SIGKILL is
sensible enough (IIRC, this will fail on some shells), but why avoid
trapping SIGTERM?
4. Some of the changes seem rather extensive for something that's
supposed to be a bug-fix release. Specifically: d.barscale, v.in.dgn,
m.in.e00, r.los, r.spread.
I've attached a summary of the changes.
--
Glynn Clements <glynn.clements@virgin.net>
(attachments)
changes.txt (8.94 KB)
On Thu, 4 Sep 2003, Glynn Clements wrote:
,
src/libes/proj/do_proj_nad.c
?
Fixes the bug mentioned here:
http://op.gfz-potsdam.de/GRASS-List/Archive/msg09197.html
...
src/mapdev/v.in.dgn/Gmakefile
src/mapdev/v.in.dgn/README
src/mapdev/v.in.dgn/main.c
?
Updated to use the copy of dgn libary embedded within GDAL rather than a
separate dgnlib, I think. Necessary changes described in this e-mail by
Thierry although they had already been made by Radim:
http://op.gfz-potsdam.de/GRASS-List/Archive/msg09677.html
On Thu, Sep 04, 2003 at 10:04:54PM +0100, Glynn Clements wrote:
Content-Description: message body and .signature
Markus Neteler wrote:
> > > If possible, I would like to release 5.0.3 tomorrow or
> > > Thursday latest (then I am out of town for more than a week).
> >
> > I'd like more time to look at the changes. Note that nobody has posted
> > a comprehensive summary of what's actually changed. I'm fairly sure
> > that some of those changes don't belong in the release branch (e.g.
> > Mike's MinGW stuff in src/general/init/chk_dbase.c, possibly
> > elsewhere).
>
> No problem to wait. I would appreciate if the changes get reviewed.A few more issues:
1. src/tcltkgrass/module/d.grid has been updated for the bordercolor=
option and -b/-g flags, but these aren't in the release version of
d.grid itself. Which one is wrong?
the update was wrong - reverted.
2. The src/tcltkgrass/module/r.proj update introduced a typo:
{checkbox -n {Do not preform region cropping optimization} "" -n}
I've fixed this one in both head and release branch.
ok
3. The signal handling changes in
src/general/init/grass.src
src/general/init/init.shprevent trapping SIGKILL (9) and SIGTERM (15). Not trapping SIGKILL is
sensible enough (IIRC, this will fail on some shells), but why avoid
trapping SIGTERM?
Seems that I didn't recall correctly the outcome of that discussion.
Readded 15 both in HEAD and release_branch.
4. Some of the changes seem rather extensive for something that's
supposed to be a bug-fix release. Specifically: d.barscale, v.in.dgn,
m.in.e00, r.los, r.spread.
Concerning r.los:
It was the "trivial" update to FP done by me (based on your
recommendations). Should be ok
I've attached a summary of the changes.
--
Glynn Clements <glynn.clements@virgin.net>
Content-Description: Changes between 5.0.2 and release branch
[...]
src/display/d.barscale/cmd/draw_scale.c
src/display/d.barscale/cmd/main.c
src/display/d.barscale/cmd/mouse.c
src/display/d.barscale/cmd/options.h
src/tcltkgrass/module/d.barscale
Upgrade
The old version was partially non-functional. It's rather impossible
(for me) to take out only the bug-fix part without added the
small improvement (-t flag).
[...]
src/general/init/grass.src
Don't trap SIGKILL, SIGTERM
SIGTERM trapped now
src/general/init/init.sh
Don't trap SIGKILL, SIGTERM
SIGTERM trapped now
Add version number
Fix for first-time use
Change test -e -> test -r
[...]
src/libes/proj/do_proj_nad.c
?
[see Paul's email]
[...]
src/mapdev/v.in.dgn/Gmakefile
src/mapdev/v.in.dgn/README
src/mapdev/v.in.dgn/main.c
?
Minor include file fixes and
2003-01-07 11:47 radim
* main.c: stroke arc and curve, read mslink of given entity number
I don't see a problem here for 5.0.3.
[...]
src/mapdev/v.out.e00/v.out.e00.c
???
2003-03-31 09:13 eric
* v.out.e00.c: Fix vector/mapset lookup. Add some type casts and
extra parens to make -Wall happy (oh, and the type casts might be
necessary on some arches).
Should be fine.
[...]
src/misc/m.in.e00/info.c
???
2002-07-19 22:51 roger
* info.c, main.c: Added the list= parameter and corrected a format
that was invalid for large INFO tables
Sounds ok.
[...]
src/raster/r.in.gdal/main.c
???
Relevant are:
2003-07-08 15:38 markus
* main.c: change to channel numbers instead of color name
extensions for multiband data in case subsequent channels have
identical color names (as for SAA AVHRR data)
2003-04-30 14:50 markus
* main.c: submitted compression change from Eric Miller. Added grey
color table for GDT_UInt16
2003-03-13 13:49 markus
* main.c: grey_scale_colors for Byte data, color name support for
known color names (Red, Green, Blue)
2002-11-07 17:59 markus
* main.c: use positive xy coordinates for unprojected TIFF instead
of negative xy coordinates
Here should be checked that the PROJ4 related updates did not reach
the release_branch. AFAIK Paul already verified it.
Maybe some release_branch testers could try r.in.gdal.
-src/raster/wildfire/src/r.spread/prob_invsqr.c
+src/raster/wildfire/src/r.spread/local_proto.h
src/raster/wildfire/src/r.spread/cell_ptrHa.h
src/raster/wildfire/src/r.spread/cmd_line.h
src/raster/wildfire/src/r.spread/collect_ori.c
src/raster/wildfire/src/r.spread/costHa.h
src/raster/wildfire/src/r.spread/deleteHa.c
src/raster/wildfire/src/r.spread/display.c
src/raster/wildfire/src/r.spread/fixHa.c
src/raster/wildfire/src/r.spread/get_minHa.c
src/raster/wildfire/src/r.spread/insert2Ha.c
src/raster/wildfire/src/r.spread/insertHa.c
src/raster/wildfire/src/r.spread/main.c
src/raster/wildfire/src/r.spread/pick_dist.c
src/raster/wildfire/src/r.spread/pick_ignite.c
src/raster/wildfire/src/r.spread/ram2out.c
src/raster/wildfire/src/r.spread/replaceHa.c
src/raster/wildfire/src/r.spread/select_linksB.c
src/raster/wildfire/src/r.spread/spot.c
src/raster/wildfire/src/r.spread/spread.c
[Tidying]
Protect headers against repeated inclusion
Move definitions from header files to source files
Use ANSI prototypes
Add local_proto.h
Remove prob_invsqr.c
Motivation:
http://grass.itc.it/pipermail/grass5/2003-March/005069.html
The old versions seemed not to work, so the fix should go
into 5.0.3.
src/scripts/contrib/d.rast.labels/d.rast.labels
Don't trap SIGKILLsrc/scripts/contrib/d.rast.leg/d.rast.leg
???
minor cosmetics, no problem I think.
[...]
src/scripts/contrib/v.line2area/v.area2line
src/scripts/contrib/v.line2area/v.line2area
Use -eq instead of = (why?)
was crashing recently - I don't know why, but the fix helped.
[...]
src/tcltkgrass/module/d.grid
*** BOGUS ***
Add bordercolor=, -b, -g
reverted.
Also done now:
- update date in
src/CMD/VERSION August -> September
NEWS.html August -> September
If there are no objections, I'll package a 5.0.3RC3 today
and produce the md5 checksum as well.
Markus