Merge branch 'master' of ssh://tiger.med-info.com:8822/srv/git/snark14kmr

diff --git a/examples/.gitignore b/examples/.gitignore
index 5ab3ae0538d7d3d10b7fc9afae8dc8f6206fd23a..c6c71e3e80a701d86d88a806766fd156f217e903 100644 (file)
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -15,3 +15,9 @@ b2/src/*.o
 */MapUser1
 b9/src/*.o
 b7/MAPUser1
+b9/snark_e.in
+b9/snark_e.out
+b9/fomfil.1
+b9/MAPUser1
+*/snark.lock
+b9/testem.1

diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644 (file)
index 0000000..f5c92f9
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,16 @@
+.PHONY: all run_all regression
+
+all:
+       @echo "Use run_all or regression"
+
+run_all:
+       ./run_all
+
+regression:
+       ./regression
+
+clean:
+       @rm -f */b[0-9].out */b1[0-9].out */file11 */prjfil */recfil */eval */src/.o b1/punch b10/eval \
+       b11/RPRTsuperiorization b11/RPRTklds */MAPUser1 b9/src/*.o b9/snark_e.in b9/snark_e.out \
+       b9/testem.1 b9/fomfil.1 */snark.lock */bin/*
+

diff --git a/tools/Display/displayprojection.cpp b/tools/Display/displayprojection.cpp
index 5cfaa60507956fcfd0113679f8cd35f2d793b737..c4773939193d537cb14c6988174b6acb91e87653 100644 (file)
--- a/tools/Display/displayprojection.cpp
+++ b/tools/Display/displayprojection.cpp
@@ -162,8 +162,8 @@ displayprojection::displayprojection(QWidget* parent, const char* name, bool mod
 
     lowthresh = new QLineEdit(this, "lowthresh");
     lowthresh->setGeometry(QRect(5, 260, 80, 30));
-    char s[6];
-    sprintf(s, "%7.4f", minval);
+    char s[16];
+    snprintf(s,sizeof(s)-1,"%7.4f", minval);
     lowthresh->setText(s);
 
     setlowthreshbutton = new QPushButton(this, "setlowthreshbutton");