|
Kevin Kofler |
f0b57f5 |
diff -ur digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake
|
|
Kevin Kofler |
f0b57f5 |
--- digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake 2011-09-14 08:22:02.000000000 +0200
|
|
Kevin Kofler |
f0b57f5 |
+++ digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake 2011-09-23 07:09:37.000000000 +0200
|
|
Kevin Kofler |
f0b57f5 |
@@ -27,7 +27,7 @@
|
|
Kevin Kofler |
f0b57f5 |
endif(CLAPACK_INCLUDE_DIR)
|
|
Kevin Kofler |
f0b57f5 |
endif(CLAPACK_INCLUDE_DIR)
|
|
Kevin Kofler |
f0b57f5 |
|
|
Kevin Kofler |
f0b57f5 |
- find_library(CLAPACK_LIBRARY clapack)
|
|
Kevin Kofler |
f0b57f5 |
+ find_library(CLAPACK_LIBRARY clapack PATH_SUFFIXES atlas)
|
|
Kevin Kofler |
f0b57f5 |
if(CLAPACK_LIBRARY)
|
|
Kevin Kofler |
f0b57f5 |
message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}")
|
|
Kevin Kofler |
f0b57f5 |
endif(CLAPACK_LIBRARY)
|
|
Kevin Kofler |
2c86765 |
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
|
|
Kevin Kofler |
2c86765 |
--- digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-14 08:22:03.000000000 +0200
|
|
Kevin Kofler |
373ec4d |
+++ digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-23 10:19:09.000000000 +0200
|
|
Kevin Kofler |
2c86765 |
@@ -36,7 +36,6 @@
|
|
Kevin Kofler |
2c86765 |
|
|
Kevin Kofler |
2c86765 |
extern "C"
|
|
Kevin Kofler |
2c86765 |
{
|
|
Kevin Kofler |
2c86765 |
-#include "f2c.h"
|
|
Kevin Kofler |
2c86765 |
#include "clapack.h"
|
|
Kevin Kofler |
2c86765 |
}
|
|
Kevin Kofler |
2c86765 |
|
|
|
c5cb927 |
@@ -653,14 +653,12 @@
|
|
Kevin Kofler |
8e6caea |
|
|
|
c5cb927 |
int RefocusMatrix::dgesv(const int N, const int NRHS, double* A, const int lda, double* B, const int ldb)
|
|
Kevin Kofler |
8e6caea |
{
|
|
Kevin Kofler |
8e6caea |
- int result = 0;
|
|
Kevin Kofler |
8e6caea |
- integer i_N = N, i_NHRS = NRHS, i_lda = lda, i_ldb = ldb, info;
|
|
|
c5cb927 |
- QScopedArrayPointer<integer> ipiv(new integer[N]);
|
|
Kevin Kofler |
8e6caea |
+ int result;
|
|
|
c5cb927 |
+ QScopedArrayPointer<int> ipiv(new int[N]);
|
|
Kevin Kofler |
2c86765 |
|
|
Kevin Kofler |
2c86765 |
// Clapack call.
|
|
|
c5cb927 |
- dgesv_(&i_N, &i_NHRS, A, &i_lda, ipiv.data(), B, &i_ldb, &info;;
|
|
|
c5cb927 |
+ result = clapack_dgesv (CblasColMajor, N, NRHS, A, lda, ipiv.data(), B, ldb);
|
|
Kevin Kofler |
2c86765 |
|
|
Kevin Kofler |
8e6caea |
- result = info;
|
|
Kevin Kofler |
8e6caea |
return (result);
|
|
Kevin Kofler |
8e6caea |
}
|
|
Kevin Kofler |
8e6caea |
|