r35406 - in /packages/teem/trunk/debian: changelog patches/00list patches/10_renameapps.dpatch patches/20_segfault.dpatch

[domibel-guest at users.alioth.debian.org]

Author: domibel-guest
Date: Wed Dec 31 23:02:06 2008
New Revision: 35406

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35406
Log:
patch added to fix a bug that caused segfaults

Added:
    packages/teem/trunk/debian/patches/20_segfault.dpatch   (with props)
Modified:
    packages/teem/trunk/debian/changelog
    packages/teem/trunk/debian/patches/00list
    packages/teem/trunk/debian/patches/10_renameapps.dpatch

Modified: packages/teem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/changelog?rev=35406&op=diff
==============================================================================
--- packages/teem/trunk/debian/changelog (original)
+++ packages/teem/trunk/debian/changelog Wed Dec 31 23:02:06 2008
@@ -5,6 +5,7 @@
 
   [ Dominique Belhachemi ]
   * added README.source
+  * patch added to fix a bug that caused segfaults
 
  -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Thu, 18 Dec 2008 15:49:57 -0500
 

Modified: packages/teem/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/00list?rev=35406&op=diff
==============================================================================
--- packages/teem/trunk/debian/patches/00list (original)
+++ packages/teem/trunk/debian/patches/00list Wed Dec 31 23:02:06 2008
@@ -1,1 +1,2 @@
 10_renameapps.dpatch
+20_segfault.dpatch

Modified: packages/teem/trunk/debian/patches/10_renameapps.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/10_renameapps.dpatch?rev=35406&op=diff
==============================================================================
--- packages/teem/trunk/debian/patches/10_renameapps.dpatch (original)
+++ packages/teem/trunk/debian/patches/10_renameapps.dpatch Wed Dec 31 23:02:06 2008
@@ -5,9 +5,9 @@
 ## DP: For each application app: rename "app" to "teem-app".
 
 @DPATCH@
-diff -urNad teem-1.10.0~/src/bin/CMakeLists.txt teem-1.10.0/src/bin/CMakeLists.txt
---- teem-1.10.0~/src/bin/CMakeLists.txt	2008-12-13 19:06:35.000000000 +0100
-+++ teem-1.10.0/src/bin/CMakeLists.txt	2008-12-13 19:06:52.000000000 +0100
+diff -urNad teem-1.10.0.dfsg1~/src/bin/CMakeLists.txt teem-1.10.0.dfsg1/src/bin/CMakeLists.txt
+--- teem-1.10.0.dfsg1~/src/bin/CMakeLists.txt	2008-12-31 17:58:25.000000000 -0500
++++ teem-1.10.0.dfsg1/src/bin/CMakeLists.txt	2008-12-31 17:58:32.000000000 -0500
 @@ -33,35 +33,35 @@
  ENDMACRO(CREATE_EXEC)
  

Added: packages/teem/trunk/debian/patches/20_segfault.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/20_segfault.dpatch?rev=35406&op=file
==============================================================================
--- packages/teem/trunk/debian/patches/20_segfault.dpatch (added)
+++ packages/teem/trunk/debian/patches/20_segfault.dpatch Wed Dec 31 23:02:06 2008
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_segfault.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for nrrdHistoAxis() and "unu histax" for a bug that caused segfaults
+
+ at DPATCH@
+diff -urNad teem-1.10.0.dfsg1~/src/nrrd/histogram.c teem-1.10.0.dfsg1/src/nrrd/histogram.c
+--- teem-1.10.0.dfsg1~/src/nrrd/histogram.c	2008-12-31 17:58:25.000000000 -0500
++++ teem-1.10.0.dfsg1/src/nrrd/histogram.c	2008-12-31 17:58:42.000000000 -0500
+@@ -403,14 +403,14 @@
+      disaster */
+   nrrdAxisInfoGet_nva(nin, nrrdAxisInfoSize, szIn);
+   nrrdAxisInfoGet_nva(nout, nrrdAxisInfoSize, szOut);
+-  memset(coordIn, 0, NRRD_DIM_MAX*sizeof(unsigned int));
++  memset(coordIn, 0, NRRD_DIM_MAX*sizeof(size_t));
+   num = nrrdElementNumber(nin);
+   for (I=0; I<num; I++) {
+     /* get input nrrd value and compute its histogram index */
+     val = nrrdDLookup[nin->type](nin->data, I);
+     if (AIR_EXISTS(val) && AIR_IN_CL(range->min, val, range->max)) {
+       hidx = airIndex(range->min, val, range->max, bins);
+-      memcpy(coordOut, coordIn, nin->dim*sizeof(int));
++      memcpy(coordOut, coordIn, nin->dim*sizeof(size_t));
+       coordOut[hax] = (unsigned int)hidx;
+       NRRD_INDEX_GEN(hI, coordOut, szOut, nout->dim);
+       count = nrrdDLookup[nout->type](nout->data, hI);

Propchange: packages/teem/trunk/debian/patches/20_segfault.dpatch
------------------------------------------------------------------------------
    svn:executable = *