[SCM] image display tool for astronomy branch, debian, updated. upstream/7.0.1+dfsg-181-ge770e27

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e770e27b165d923522da2e4a229b28d9c9651a10
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Dec 17 13:25:17 2012 +0100

    Fix crashes on 2D marker plots, closes: #693807

diff --git a/debian/changelog b/debian/changelog
index df57c98..5afd46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+saods9 (7.1+dfsg-1~exp2) experimental; urgency=low
+
+  * Fix crashes on 2D marker plots, closes: #693807
+  * Remove obsolete DMUA Flag
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 17 Dec 2012 13:20:43 +0100
+
 saods9 (7.1+dfsg-1~exp1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/blt_fix_crash.patch b/debian/patches/blt_fix_crash.patch
index db6a85b..898d41a 100644
--- a/debian/patches/blt_fix_crash.patch
+++ b/debian/patches/blt_fix_crash.patch
@@ -96,3 +96,62 @@ Description: BLT crashes when it reaches this code. This seems to be some
  
  #ifdef USE_TCL_STUBS
      if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) {
+--- a/saotk/frame/marker.C
++++ b/saotk/frame/marker.C
+@@ -1166,19 +1166,19 @@
+ {
+   Blt_Vector* xx;
+   Blt_GetVector(parent->getInterp(), xname, &xx);
+-  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* yy;
+   Blt_GetVector(parent->getInterp(), yname, &yy);
+-  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* xxc;
+   Blt_GetVector(parent->getInterp(), xcname, &xxc);
+-  Blt_ResetVector(xxc, xc, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(xxc, xc, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* yyc;
+   Blt_GetVector(parent->getInterp(), ycname, &yyc);
+-  Blt_ResetVector(yyc, yc, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(yyc, yc, num, num*sizeof(double), TCL_STATIC);
+ }
+ 
+ void Marker::analysisPlot3dResult(char* xname, char* yname, 
+@@ -1187,11 +1187,11 @@
+ {
+   Blt_Vector* xx;
+   Blt_GetVector(parent->getInterp(), xname, &xx);
+-  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* yy;
+   Blt_GetVector(parent->getInterp(), yname, &yy);
+-  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC);
+ }
+ 
+ void Marker::analysisPandaResult(double* x, double* y, double* e, int num)
+@@ -1208,15 +1208,15 @@
+ {
+   Blt_Vector* xx;
+   Blt_GetVector(parent->getInterp(), xname, &xx);
+-  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* yy;
+   Blt_GetVector(parent->getInterp(), yname, &yy);
+-  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC);
+ 
+   Blt_Vector* ee;
+   Blt_GetVector(parent->getInterp(), ename, &ee);
+-  Blt_ResetVector(ee, e, num, num*sizeof(double), TCL_DYNAMIC);
++  Blt_ResetVector(ee, e, num, num*sizeof(double), TCL_STATIC);
+ }
+ 
+ Matrix Marker::fwdMatrix()

-- 
image display tool for astronomy