File 3ebaf33693caa2d9faf3cfad864f84c638e2cabe.patch of Package opentoonz

Overview Repositories Revisions Requests Users Attributes Meta

File 3ebaf33693caa2d9faf3cfad864f84c638e2cabe.patch of Package opentoonz (Revision 6e8ef4409d118e40c2e0213cc83048df)

Currently displaying revision 6e8ef4409d118e40c2e0213cc83048df , Show latest

From 3ebaf33693caa2d9faf3cfad864f84c638e2cabe Mon Sep 17 00:00:00 2001
From: jabarrera <jabarrera@users.noreplay.github.com>
Date: Tue, 13 Dec 2016 11:59:30 +1100
Subject: [PATCH] Fix plastic tool crash with SuperLU 5.x

Fixes crash on Linux #623,
but allows updating thirdparty lib to 5.x too.
---
 toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp b/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
index 0dcf0c5..8402ed0 100644
--- a/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
+++ b/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
@@ -1,8 +1,8 @@
 
 
 extern "C" {
-#include "slu_ddefs.h"
-#include "slu_util.h"
+#include <slu_ddefs.h>
+#include <slu_util.h>
 }
 
 #include <algorithm>
@@ -308,8 +308,15 @@ void tlin::factorize(SuperMatrix *A, SuperFactors *&F, superlu_options_t *opt) {
   StatInit(&stat);
 
   int result;
+
+#if defined(SUPERLU_MAJOR_VERSION) && (SUPERLU_MAJOR_VERSION >= 5)
+  GlobalLU_t Glu;
+  dgstrf(opt, &AC, sp_ienv(1), sp_ienv(2), etree, NULL, 0, F->perm_c, F->perm_r,
+         F->L, F->U, &Glu, &stat, &result);
+#else
   dgstrf(opt, &AC, sp_ienv(1), sp_ienv(2), etree, NULL, 0, F->perm_c, F->perm_r,
          F->L, F->U, &stat, &result);
+#endif
 
   StatFree(&stat);

Places

File 3ebaf33693caa2d9faf3cfad864f84c638e2cabe.patch of Package opentoonz (Revision 6e8ef4409d118e40c2e0213cc83048df)

Places