Integrate changes needed for OpenCV

barche · barche · commit d4192fe3ea20 · 2024-11-13T15:58:51.000+01:00
Issue JuliaInterop/CxxWrap.jl#260
diff --git a/include/jlcxx/array.hpp b/include/jlcxx/array.hpp
@@ -252,6 +252,10 @@ class ArrayRef
     {
       return data()[i];
     }
+    else if constexpr(std::is_same<julia_t, static_julia_type<ValueT>>::value && !std::is_same<julia_t, WrappedCppPtr>::value)
+    {
+      return *reinterpret_cast<ValueT*>(&data()[i]);
+    }
     else
     {
       return *extract_pointer_nonull<ValueT>(data()[i]);
@@ -263,6 +267,10 @@ class ArrayRef
     if constexpr(std::is_same<julia_t, ValueT>::value)
     {
       return data()[i];
+    }
+     else if constexpr(std::is_same<julia_t, static_julia_type<ValueT>>::value && !std::is_same<julia_t, WrappedCppPtr>::value)
+    {
+      return *reinterpret_cast<ValueT*>(&data()[i]);
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,10 @@ class ArrayRef`
`252`	`252`	`{`
`253`	`253`	`return data()[i];`
`254`	`254`	`}`
	`255`	`+ else if constexpr(std::is_same<julia_t, static_julia_type<ValueT>>::value && !std::is_same<julia_t, WrappedCppPtr>::value)`
	`256`	`+ {`
	`257`	`+ return reinterpret_cast<ValueT>(&data()[i]);`
	`258`	`+ }`
`255`	`259`	`else`
`256`	`260`	`{`
`257`	`261`	`return *extract_pointer_nonull<ValueT>(data()[i]);`
`@@ -263,6 +267,10 @@ class ArrayRef`
`263`	`267`	`if constexpr(std::is_same<julia_t, ValueT>::value)`
`264`	`268`	`{`
`265`	`269`	`return data()[i];`
	`270`	`+ }`
	`271`	`+ else if constexpr(std::is_same<julia_t, static_julia_type<ValueT>>::value && !std::is_same<julia_t, WrappedCppPtr>::value)`
	`272`	`+ {`
	`273`	`+ return reinterpret_cast<ValueT>(&data()[i]);`
`266`	`274`	`}`
`267`	`275`	`else`
`268`	`276`	`{`