Author: frankie
Date: 2010-09-28 10:30:28 +0000 (Tue, 28 Sep 2010)
New Revision: 2935
Added:
packages/grass/trunk/debian/patches/filldepr.cc.dpatch
packages/grass/trunk/debian/patches/flythrough.dpatch
packages/grass/trunk/debian/patches/geom.c.dpatch
Modified:
packages/grass/trunk/debian/changelog
packages/grass/trunk/debian/patches/00list
Log:
More patches.
Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog 2010-09-28 09:45:16 UTC (rev
2934)
+++ packages/grass/trunk/debian/changelog 2010-09-28 10:30:28 UTC (rev
2935)
@@ -23,6 +23,9 @@
+ read_sig.c: catch empty sig files
+ convert.c: added non-standard datum name lookup
+ r.grow.distance: bugfix for distance calculation
+ + geom.c: fixes bug for min_area
+ + flythrough: fixes NVIZ fly mode on 64bit. See #46 from upstream trac.
+ + filldepr.cc: r.terraflow: backport fix for #1006 from upstream trac.
* Added missing docs used by GUIs: AUTHORS, contributors CSV files,
COPYING and a symlink to GPL-2 license in /usr/share/common-licenses.
Those files need to be symlinked in GISBASE to be found at run-time.
Modified: packages/grass/trunk/debian/patches/00list
===================================================================
--- packages/grass/trunk/debian/patches/00list 2010-09-28 09:45:16 UTC (rev
2934)
+++ packages/grass/trunk/debian/patches/00list 2010-09-28 10:30:28 UTC (rev
2935)
@@ -13,3 +13,6 @@
read_sig.c
convert.c
r.grow.distance
+geom.c
+flythrough
+filldepr.cc
Added: packages/grass/trunk/debian/patches/filldepr.cc.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/filldepr.cc.dpatch
(rev 0)
+++ packages/grass/trunk/debian/patches/filldepr.cc.dpatch 2010-09-28
10:30:28 UTC (rev 2935)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filldepr.cc.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
grass-6.4.0~rc6+42329~/raster/r.terraflow/filldepr.cc
grass-6.4.0~rc6+42329/raster/r.terraflow/filldepr.cc
+--- grass-6.4.0~rc6+42329~/raster/r.terraflow/filldepr.cc 2010-03-15
14:26:24.000000000 +0100
++++ grass-6.4.0~rc6+42329/raster/r.terraflow/filldepr.cc 2010-09-28
12:15:26.000000000 +0200
+@@ -128,8 +128,10 @@
+ boundaryType* nextedge;
+ elevation_type h;
+ cclabel_type u, v, ur, vr;
++ /* no write op to boundaryStr, no need to call stream_len() each time */
++ off_t nitems = boundaryStr->stream_len();
+ boundaryStr->seek(0);
+- for (size_t i=0; i< boundaryStr->stream_len(); i++) {
++ for (off_t i=0; i< nitems; i++) {
+
+ /*read next edge*/
+ ae = boundaryStr->read_item(&nextedge);
Property changes on: packages/grass/trunk/debian/patches/filldepr.cc.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/flythrough.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/flythrough.dpatch
(rev 0)
+++ packages/grass/trunk/debian/patches/flythrough.dpatch 2010-09-28
10:30:28 UTC (rev 2935)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## flythrough.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
grass-6.4.0~rc6+42329~/visualization/nviz/src/togl_flythrough.c
grass-6.4.0~rc6+42329/visualization/nviz/src/togl_flythrough.c
+--- grass-6.4.0~rc6+42329~/visualization/nviz/src/togl_flythrough.c
2010-03-15 14:28:31.000000000 +0100
++++ grass-6.4.0~rc6+42329/visualization/nviz/src/togl_flythrough.c
2010-09-28 11:55:16.000000000 +0200
+@@ -317,7 +317,7 @@
+ struct timeval tv;
+
+ gettimeofday(&tv, NULL);
+- return ((float)tv.tv_sec + ((float)tv.tv_usec / 1000000.0));
++ return ((double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0));
+ #endif
+ }
+
Property changes on: packages/grass/trunk/debian/patches/flythrough.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/geom.c.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/geom.c.dpatch
(rev 0)
+++ packages/grass/trunk/debian/patches/geom.c.dpatch 2010-09-28 10:30:28 UTC
(rev 2935)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## geom.c.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
grass-6.4.0~rc6+42329~/vector/v.in.ogr/geom.c
grass-6.4.0~rc6+42329/vector/v.in.ogr/geom.c
+--- grass-6.4.0~rc6+42329~/vector/v.in.ogr/geom.c 2010-03-15
14:26:40.000000000 +0100
++++ grass-6.4.0~rc6+42329/vector/v.in.ogr/geom.c 2010-09-28
11:52:07.000000000 +0200
+@@ -100,7 +100,14 @@
+ Vect_append_point(IPoints[valid_isles], OGR_G_GetX(hRing,
j),
+ OGR_G_GetY(hRing, j), OGR_G_GetZ(hRing,
j));
+ }
+- valid_isles++;
++ size =
++ G_area_of_polygon(IPoints[valid_isles]->x,
++ IPoints[valid_isles]->y,
++ IPoints[valid_isles]->n_points);
++ if (size < min_area)
++ Vect_destroy_line_struct(IPoints[valid_isles]);
++ else
++ valid_isles++;
+ }
+ }
+
+@@ -282,7 +289,10 @@
+ G_warning(_("Degenerate island ([%d] vertices)"),
+ IPoints[i - 1]->n_points);
+
+- size = G_area_of_polygon(Points->x, Points->y,
Points->n_points);
++ size =
++ G_area_of_polygon(IPoints[valid_isles]->x,
++ IPoints[valid_isles]->y,
++ IPoints[valid_isles]->n_points);
+ if (size < min_area) {
+ G_warning(_("Island size [%.1e], island not imported"),
size);
+ }
Property changes on: packages/grass/trunk/debian/patches/geom.c.dpatch
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
