From e3fe51dde5afed99a393e3b1b1f611fde011d9f3 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Thu, 8 Apr 2021 12:38:08 -0400 Subject: fix some things --- wrapper/wrapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wrapper/wrapper.cpp') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 7992de6..6376100 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -517,9 +517,9 @@ public: auto settings = gcnew ExtendedSettings(); Marshal::PtrToStructure(IntPtr(&instance->data.args), settings->baseSettings); settings->tables.x = extract(instance->data.args.argsv.x.lut_args.mode, - instance->data.mod.accels.x); + instance->data.mod.accel.x); settings->tables.y = extract(instance->data.args.argsv.y.lut_args.mode, - instance->data.mod.accels.y); + instance->data.mod.accel.y); return settings; } @@ -530,11 +530,11 @@ public: instance->inv = ra::invokers(instance->data.args); if (val->tables.x) { - val->tables.x->SetData(instance->data.mod.accels.x); + val->tables.x->SetData(instance->data.mod.accel.x); } if (val->tables.y) { - val->tables.y->SetData(instance->data.mod.accels.y); + val->tables.y->SetData(instance->data.mod.accel.y); } } -- cgit v1.2.3 From 74ffcb8553795f4b50e544a1b2a0e53aec32a860 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Thu, 8 Apr 2021 21:48:17 -0400 Subject: make sizeof arbitrary close to others refactor constructor/fix conversions --- wrapper/wrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wrapper/wrapper.cpp') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 6376100..f7da5d4 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -210,7 +210,7 @@ public ref struct SpacedLut abstract : public LutBase void SetDataBase(ra::accel_union& accel) { - if (size_t(data->LongLength) > ra::LUT_CAPACITY) { + if (size_t(data->LongLength) > ra::SPACED_LUT_CAPACITY) { throw gcnew InteropException("data is too large"); } } -- cgit v1.2.3