Mercurial > forge

changeset 2818:7088851def1d octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix indexing errors, Makefile and init a few vars in xraylib
author tpikonen
date Fri, 15 Dec 2006 16:16:38 +0000
parents 37ea1b20f811
children 8f24e10508f7
files extra/xraylib/src/Makefile extra/xraylib/src/xraylib.cc extra/xraylib/src/xraylib/src/xrayvars.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/extra/xraylib/src/Makefile	Thu Dec 14 16:34:14 2006 +0000
+++ b/extra/xraylib/src/Makefile	Fri Dec 15 16:16:38 2006 +0000
@@ -8,4 +8,4 @@
 	touch xraylib_stamp
 clean:
 	make -C xraylib/src clean
-	-rm *.o *~ xraylib_stamp xraylib.oct
+	-rm *.o *.oct *~ xraylib_stamp
--- a/extra/xraylib/src/xraylib.cc	Thu Dec 14 16:34:14 2006 +0000
+++ b/extra/xraylib/src/xraylib.cc	Fri Dec 15 16:16:38 2006 +0000
@@ -64,7 +64,7 @@
    for(int i = 0; i < p.length(); i++) { \
       for(int j = 0; j < m.length(); j++) { \
          for(int k = 0; k < n.length(); k++) { \
-            y(k, j, i) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(j)), \
+            y(k, j, i) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(k)), \
                                                    static_cast<T2>(m.xelem(j)), \
                                                    static_cast<T3>(p.xelem(i)))); \
          } \
@@ -89,8 +89,8 @@
       idx(2) = k; \
       for(int l = 0; l < n.length(); l++) { \
       idx(3) = i; \
-	 y(idx) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(j)), \
-                                            static_cast<T2>(m.xelem(j)), \
+	 y(idx) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(l)), \
+                                            static_cast<T2>(m.xelem(k)), \
                                             static_cast<T3>(p.xelem(j)), \
                                             static_cast<T4>(q.xelem(i)))); \
       } } } \
--- a/extra/xraylib/src/xraylib/src/xrayvars.c	Thu Dec 14 16:34:14 2006 +0000
+++ b/extra/xraylib/src/xraylib/src/xrayvars.c	Fri Dec 15 16:16:38 2006 +0000
@@ -8,8 +8,8 @@
 /////            Variables                                       /////
 //////////////////////////////////////////////////////////////////////
 
-int HardExit;
-int ExitStatus;
+int HardExit = 0;
+int ExitStatus = 0;
 char XRayLibDir[MAXFILENAMESIZE];
 
 char ShellName[][5] = {