[digikam] Fix the patch (the ATLAS clapack API is much closer to plain C than the NETLIB one).
Kevin Kofler
kkofler at fedoraproject.org
Fri Sep 23 07:44:39 UTC 2011
commit 8e6caeaefe812555636df34172e213b464a0fe89
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Fri Sep 23 09:44:16 2011 +0200
Fix the patch (the ATLAS clapack API is much closer to plain C than the NETLIB one).
digikam-2.1.1-clapack-atlas.patch | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/digikam-2.1.1-clapack-atlas.patch b/digikam-2.1.1-clapack-atlas.patch
index 403b485..35ced31 100644
--- a/digikam-2.1.1-clapack-atlas.patch
+++ b/digikam-2.1.1-clapack-atlas.patch
@@ -12,7 +12,7 @@ diff -ur digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake digikam-2.1.1-clapac
endif(CLAPACK_LIBRARY)
diff -ur digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp
--- digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-14 08:22:03.000000000 +0200
-+++ digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-23 08:43:36.000000000 +0200
++++ digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-23 09:29:53.000000000 +0200
@@ -36,7 +36,6 @@
extern "C"
@@ -21,12 +21,22 @@ diff -ur digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp digikam-2.1.1-cla
#include "clapack.h"
}
-@@ -658,7 +657,7 @@
- integer* ipiv = new integer[N];
+@@ -653,15 +652,13 @@
+
+ int RefocusMatrix::dgesv (const int N, const int NRHS, double* A, const int lda, double* B, const int ldb)
+ {
+- int result = 0;
+- integer i_N = N, i_NHRS = NRHS, i_lda = lda, i_ldb = ldb, info;
+- integer* ipiv = new integer[N];
++ int result;
++ int* ipiv = new int[N];
// Clapack call.
- dgesv_ (&i_N, &i_NHRS, A, &i_lda, ipiv, B, &i_ldb, &info);
-+ clapack_dgesv (CblasColMajor, &i_N, &i_NHRS, A, &i_lda, ipiv, B, &i_ldb, &info);
++ result = clapack_dgesv (CblasColMajor, N, NHRS, A, lda, ipiv, B, ldb);
delete [] ipiv;
- result = info;
+- result = info;
+ return (result);
+ }
+
More information about the scm-commits
mailing list