From fc40ada564d02523d7fcb6110321b9c1f0b6a6a0 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Wed, 12 May 2021 08:33:55 +0900 Subject: [PATCH] * Upgrade presets for OpenBLAS 0.3.15, DNNL 2.2.2, CPython 3.9.5, NumPy 1.20.3, SciPy 1.6.3, cuDNN 8.2.0 --- .github/actions/deploy-centos/action.yml | 4 +- .github/actions/deploy-macosx/action.yml | 4 +- .github/actions/deploy-ubuntu/action.yml | 6 +- .github/actions/deploy-windows/action.yml | 4 +- CHANGELOG.md | 2 +- README.md | 4 +- arpack-ng/platform/pom.xml | 2 +- arpack-ng/pom.xml | 6 +- caffe/README.md | 2 +- caffe/platform/gpu/pom.xml | 2 +- caffe/platform/pom.xml | 2 +- caffe/pom.xml | 6 +- caffe/samples/pom.xml | 2 +- chilitags/pom.xml | 4 +- cminpack/platform/pom.xml | 2 +- cminpack/pom.xml | 6 +- cpython/README.md | 4 +- cpython/cppbuild.sh | 2 +- cpython/platform/pom.xml | 2 +- cpython/pom.xml | 2 +- cpython/samples/pom.xml | 4 +- .../org/bytedeco/cpython/PyASCIIObject.java | 2 +- .../java/org/bytedeco/cpython/PyAddrPair.java | 2 +- .../bytedeco/cpython/PyAsyncGenObject.java | 2 +- .../org/bytedeco/cpython/PyAsyncMethods.java | 2 +- .../cpython/PyBaseExceptionObject.java | 2 +- .../org/bytedeco/cpython/PyBufferProcs.java | 2 +- .../bytedeco/cpython/PyByteArrayObject.java | 2 +- .../org/bytedeco/cpython/PyBytesObject.java | 2 +- .../bytedeco/cpython/PyCFunctionObject.java | 2 +- .../org/bytedeco/cpython/PyCMethodObject.java | 2 +- .../org/bytedeco/cpython/PyCellObject.java | 2 +- .../org/bytedeco/cpython/PyCodeObject.java | 2 +- .../cpython/PyCompactUnicodeObject.java | 2 +- .../org/bytedeco/cpython/PyCompilerFlags.java | 2 +- .../org/bytedeco/cpython/PyComplexObject.java | 2 +- .../java/org/bytedeco/cpython/PyConfig.java | 2 +- .../org/bytedeco/cpython/PyCoroObject.java | 2 +- .../org/bytedeco/cpython/PyDateTime_CAPI.java | 2 +- .../org/bytedeco/cpython/PyDateTime_Date.java | 2 +- .../bytedeco/cpython/PyDateTime_DateTime.java | 2 +- .../bytedeco/cpython/PyDateTime_Delta.java | 2 +- .../bytedeco/cpython/PyDateTime_TZInfo.java | 2 +- .../org/bytedeco/cpython/PyDateTime_Time.java | 2 +- .../org/bytedeco/cpython/PyDescrObject.java | 2 +- .../org/bytedeco/cpython/PyDictObject.java | 2 +- .../org/bytedeco/cpython/PyFloatObject.java | 2 +- .../bytedeco/cpython/PyFunctionObject.java | 2 +- .../bytedeco/cpython/PyFutureFeatures.java | 2 +- .../org/bytedeco/cpython/PyGenObject.java | 2 +- .../org/bytedeco/cpython/PyGetSetDef.java | 2 +- .../bytedeco/cpython/PyGetSetDescrObject.java | 2 +- .../bytedeco/cpython/PyHeapTypeObject.java | 2 +- .../bytedeco/cpython/PyImportErrorObject.java | 2 +- .../cpython/PyInstanceMethodObject.java | 2 +- .../org/bytedeco/cpython/PyListObject.java | 2 +- .../bytedeco/cpython/PyMappingMethods.java | 2 +- .../bytedeco/cpython/PyMemAllocatorEx.java | 2 +- .../org/bytedeco/cpython/PyMemberDef.java | 2 +- .../bytedeco/cpython/PyMemberDescrObject.java | 2 +- .../bytedeco/cpython/PyMemoryViewObject.java | 2 +- .../org/bytedeco/cpython/PyMethodDef.java | 2 +- .../bytedeco/cpython/PyMethodDescrObject.java | 2 +- .../org/bytedeco/cpython/PyMethodObject.java | 2 +- .../org/bytedeco/cpython/PyModuleDef.java | 2 +- .../bytedeco/cpython/PyModuleDef_Base.java | 2 +- .../bytedeco/cpython/PyModuleDef_Slot.java | 2 +- .../org/bytedeco/cpython/PyNumberMethods.java | 2 +- .../org/bytedeco/cpython/PyOSErrorObject.java | 2 +- .../java/org/bytedeco/cpython/PyObject.java | 2 +- .../cpython/PyObjectArenaAllocator.java | 2 +- .../org/bytedeco/cpython/PyPreConfig.java | 2 +- .../org/bytedeco/cpython/PySTEntryObject.java | 2 +- .../bytedeco/cpython/PySequenceMethods.java | 2 +- .../org/bytedeco/cpython/PySetObject.java | 2 +- .../org/bytedeco/cpython/PySliceObject.java | 2 +- .../java/org/bytedeco/cpython/PyStatus.java | 2 +- .../cpython/PyStopIterationObject.java | 2 +- .../cpython/PyStructSequence_Desc.java | 2 +- .../cpython/PyStructSequence_Field.java | 2 +- .../bytedeco/cpython/PySyntaxErrorObject.java | 2 +- .../bytedeco/cpython/PySystemExitObject.java | 2 +- .../org/bytedeco/cpython/PyThreadState.java | 2 +- .../bytedeco/cpython/PyTracebackObject.java | 2 +- .../java/org/bytedeco/cpython/PyTryBlock.java | 2 +- .../org/bytedeco/cpython/PyTupleObject.java | 2 +- .../org/bytedeco/cpython/PyTypeObject.java | 2 +- .../org/bytedeco/cpython/PyType_Slot.java | 2 +- .../org/bytedeco/cpython/PyType_Spec.java | 2 +- .../cpython/PyUnicodeErrorObject.java | 2 +- .../org/bytedeco/cpython/PyUnicodeObject.java | 2 +- .../org/bytedeco/cpython/PyVarObject.java | 2 +- .../bytedeco/cpython/PyWideStringList.java | 2 +- .../cpython/PyWrapperDescrObject.java | 2 +- .../java/org/bytedeco/cpython/Py_buffer.java | 2 +- .../java/org/bytedeco/cpython/Py_complex.java | 2 +- .../bytedeco/cpython/_PyASTOptimizeState.java | 2 +- .../org/bytedeco/cpython/_PyArg_Parser.java | 2 +- .../org/bytedeco/cpython/_PyBytesWriter.java | 2 +- .../cpython/_PyCrossInterpreterData.java | 2 +- .../cpython/_PyDateTime_BaseDateTime.java | 2 +- .../cpython/_PyDateTime_BaseTZInfo.java | 2 +- .../cpython/_PyDateTime_BaseTime.java | 2 +- .../bytedeco/cpython/_PyDictViewObject.java | 2 +- .../bytedeco/cpython/_PyErr_StackItem.java | 2 +- .../cpython/_PyManagedBufferObject.java | 2 +- .../bytedeco/cpython/_PyUnicodeWriter.java | 2 +- .../bytedeco/cpython/_PyWeakReference.java | 2 +- .../bytedeco/cpython/_Py_HashSecret_t.java | 2 +- .../org/bytedeco/cpython/_Py_Identifier.java | 2 +- .../bytedeco/cpython/_Py_clock_info_t.java | 2 +- .../java/org/bytedeco/cpython/_Py_tss_t.java | 2 +- .../gen/java/org/bytedeco/cpython/_alias.java | 2 +- .../gen/java/org/bytedeco/cpython/_arg.java | 2 +- .../java/org/bytedeco/cpython/_arguments.java | 2 +- .../org/bytedeco/cpython/_comprehension.java | 2 +- .../org/bytedeco/cpython/_excepthandler.java | 2 +- .../gen/java/org/bytedeco/cpython/_expr.java | 2 +- .../gen/java/org/bytedeco/cpython/_frame.java | 2 +- .../java/org/bytedeco/cpython/_frozen.java | 2 +- .../java/org/bytedeco/cpython/_inittab.java | 2 +- .../java/org/bytedeco/cpython/_keyword.java | 2 +- .../org/bytedeco/cpython/_longobject.java | 2 +- .../gen/java/org/bytedeco/cpython/_mod.java | 2 +- .../gen/java/org/bytedeco/cpython/_stmt.java | 2 +- .../org/bytedeco/cpython/_type_ignore.java | 2 +- .../java/org/bytedeco/cpython/_withitem.java | 2 +- .../org/bytedeco/cpython/asdl_int_seq.java | 2 +- .../java/org/bytedeco/cpython/asdl_seq.java | 2 +- .../org/bytedeco/cpython/global/python.java | 8 +- .../gen/java/org/bytedeco/cpython/node.java | 2 +- .../java/org/bytedeco/cpython/setentry.java | 2 +- .../java/org/bytedeco/cpython/symtable.java | 2 +- .../org/bytedeco/cpython/wrapperbase.java | 2 +- cuda/README.md | 6 +- cuda/platform/pom.xml | 2 +- cuda/platform/redist/pom.xml | 2 +- cuda/pom.xml | 2 +- cuda/samples/pom.xml | 4 +- .../cuda/cublas/cublasLtMatmulAlgo_t.java | 2 +- .../cublas/cublasLtMatmulDescOpaque_t.java | 2 +- .../cublasLtMatmulHeuristicResult_t.java | 2 +- .../cublasLtMatmulPreferenceOpaque_t.java | 2 +- .../cublas/cublasLtMatrixLayoutOpaque_t.java | 2 +- .../cublasLtMatrixTransformDescOpaque_t.java | 2 +- .../cudart/CUDA_ARRAY3D_DESCRIPTOR_v2.java | 2 +- .../cuda/cudart/CUDA_ARRAY_DESCRIPTOR_v2.java | 2 +- .../CUDA_ARRAY_SPARSE_PROPERTIES_v1.java | 2 +- .../CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1.java | 2 +- .../CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1.java | 2 +- ...TERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1.java | 2 +- ...UDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1.java | 2 +- ...A_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1.java | 2 +- ...UDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1.java | 2 +- .../CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1.java | 2 +- .../CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1.java | 2 +- .../cuda/cudart/CUDA_HOST_NODE_PARAMS_v1.java | 2 +- .../cudart/CUDA_KERNEL_NODE_PARAMS_v1.java | 2 +- .../cuda/cudart/CUDA_LAUNCH_PARAMS_v1.java | 2 +- .../cuda/cudart/CUDA_MEMCPY2D_v2.java | 2 +- .../cuda/cudart/CUDA_MEMCPY3D_PEER_v1.java | 2 +- .../cuda/cudart/CUDA_MEMCPY3D_v2.java | 2 +- .../cudart/CUDA_MEMSET_NODE_PARAMS_v1.java | 2 +- .../CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1.java | 2 +- .../cuda/cudart/CUDA_RESOURCE_DESC_v1.java | 2 +- .../cudart/CUDA_RESOURCE_VIEW_DESC_v1.java | 2 +- .../cuda/cudart/CUDA_TEXTURE_DESC_v1.java | 2 +- .../cuda/cudart/CUaccessPolicyWindow_v1.java | 2 +- .../cuda/cudart/CUarrayMapInfo_v1.java | 2 +- .../bytedeco/cuda/cudart/CUdevprop_v1.java | 2 +- .../cuda/cudart/CUipcEventHandle_v1.java | 2 +- .../cuda/cudart/CUipcMemHandle_v1.java | 2 +- .../cuda/cudart/CUkernelNodeAttrValue_v1.java | 2 +- .../cuda/cudart/CUmemAccessDesc_v1.java | 2 +- .../cuda/cudart/CUmemAllocationProp_v1.java | 2 +- .../cuda/cudart/CUmemLocation_v1.java | 2 +- .../cuda/cudart/CUmemPoolProps_v1.java | 2 +- .../cudart/CUmemPoolPtrExportData_v1.java | 2 +- .../cuda/cudart/CUstreamAttrValue_v1.java | 2 +- .../cudart/CUstreamBatchMemOpParams_v1.java | 2 +- .../java/org/bytedeco/cuda/cudart/CUuuid.java | 2 +- .../org/bytedeco/cuda/cudart/CUuuid_st.java | 2 +- .../org/bytedeco/cuda/cudart/__half2.java | 2 +- .../org/bytedeco/cuda/cudart/__half2_raw.java | 2 +- .../org/bytedeco/cuda/cudart/__half_raw.java | 2 +- .../java/org/bytedeco/cuda/cudart/char1.java | 2 +- .../java/org/bytedeco/cuda/cudart/char2.java | 2 +- .../java/org/bytedeco/cuda/cudart/char3.java | 2 +- .../java/org/bytedeco/cuda/cudart/char4.java | 2 +- .../cuda/cudart/cudaAccessPolicyWindow.java | 2 +- .../cudart/cudaArraySparseProperties.java | 2 +- .../cuda/cudart/cudaChannelFormatDesc.java | 2 +- .../bytedeco/cuda/cudart/cudaDeviceProp.java | 2 +- .../org/bytedeco/cuda/cudart/cudaExtent.java | 2 +- .../cudart/cudaExternalMemoryBufferDesc.java | 2 +- .../cudart/cudaExternalMemoryHandleDesc.java | 2 +- .../cudaExternalMemoryMipmappedArrayDesc.java | 2 +- .../cudaExternalSemaphoreHandleDesc.java | 2 +- ...cudaExternalSemaphoreSignalNodeParams.java | 2 +- .../cudaExternalSemaphoreSignalParams.java | 2 +- .../cudaExternalSemaphoreWaitNodeParams.java | 2 +- .../cudaExternalSemaphoreWaitParams.java | 2 +- .../cuda/cudart/cudaFuncAttributes.java | 2 +- .../cuda/cudart/cudaHostNodeParams.java | 2 +- .../cuda/cudart/cudaIpcEventHandle_t.java | 2 +- .../cuda/cudart/cudaIpcMemHandle_t.java | 2 +- .../cuda/cudart/cudaKernelNodeAttrValue.java | 2 +- .../cuda/cudart/cudaKernelNodeParams.java | 2 +- .../cuda/cudart/cudaLaunchParams.java | 2 +- .../cuda/cudart/cudaMemAccessDesc.java | 2 +- .../bytedeco/cuda/cudart/cudaMemLocation.java | 2 +- .../cuda/cudart/cudaMemPoolProps.java | 2 +- .../cuda/cudart/cudaMemPoolPtrExportData.java | 2 +- .../cuda/cudart/cudaMemcpy3DParms.java | 2 +- .../cuda/cudart/cudaMemcpy3DPeerParms.java | 2 +- .../cuda/cudart/cudaMemsetParams.java | 2 +- .../bytedeco/cuda/cudart/cudaPitchedPtr.java | 2 +- .../cuda/cudart/cudaPointerAttributes.java | 2 +- .../org/bytedeco/cuda/cudart/cudaPos.java | 2 +- .../cuda/cudart/cudaResourceDesc.java | 2 +- .../cuda/cudart/cudaResourceViewDesc.java | 2 +- .../cuda/cudart/cudaStreamAttrValue.java | 2 +- .../bytedeco/cuda/cudart/cudaTextureDesc.java | 2 +- .../java/org/bytedeco/cuda/cudart/dim3.java | 2 +- .../org/bytedeco/cuda/cudart/double1.java | 2 +- .../org/bytedeco/cuda/cudart/double2.java | 2 +- .../org/bytedeco/cuda/cudart/double3.java | 2 +- .../org/bytedeco/cuda/cudart/double4.java | 2 +- .../java/org/bytedeco/cuda/cudart/float1.java | 2 +- .../java/org/bytedeco/cuda/cudart/float2.java | 2 +- .../java/org/bytedeco/cuda/cudart/float3.java | 2 +- .../java/org/bytedeco/cuda/cudart/float4.java | 2 +- .../java/org/bytedeco/cuda/cudart/int1.java | 2 +- .../java/org/bytedeco/cuda/cudart/int2.java | 2 +- .../java/org/bytedeco/cuda/cudart/int3.java | 2 +- .../java/org/bytedeco/cuda/cudart/int4.java | 2 +- .../java/org/bytedeco/cuda/cudart/long1.java | 2 +- .../java/org/bytedeco/cuda/cudart/long2.java | 2 +- .../java/org/bytedeco/cuda/cudart/long3.java | 2 +- .../java/org/bytedeco/cuda/cudart/long4.java | 2 +- .../org/bytedeco/cuda/cudart/longlong1.java | 2 +- .../org/bytedeco/cuda/cudart/longlong2.java | 2 +- .../org/bytedeco/cuda/cudart/longlong3.java | 2 +- .../org/bytedeco/cuda/cudart/longlong4.java | 2 +- .../java/org/bytedeco/cuda/cudart/short1.java | 2 +- .../java/org/bytedeco/cuda/cudart/short2.java | 2 +- .../java/org/bytedeco/cuda/cudart/short3.java | 2 +- .../java/org/bytedeco/cuda/cudart/short4.java | 2 +- .../cuda/cudart/surfaceReference.java | 2 +- .../cuda/cudart/textureReference.java | 2 +- .../java/org/bytedeco/cuda/cudart/uchar1.java | 2 +- .../java/org/bytedeco/cuda/cudart/uchar2.java | 2 +- .../java/org/bytedeco/cuda/cudart/uchar3.java | 2 +- .../java/org/bytedeco/cuda/cudart/uchar4.java | 2 +- .../java/org/bytedeco/cuda/cudart/uint1.java | 2 +- .../java/org/bytedeco/cuda/cudart/uint2.java | 2 +- .../java/org/bytedeco/cuda/cudart/uint3.java | 2 +- .../java/org/bytedeco/cuda/cudart/uint4.java | 2 +- .../java/org/bytedeco/cuda/cudart/ulong1.java | 2 +- .../java/org/bytedeco/cuda/cudart/ulong2.java | 2 +- .../java/org/bytedeco/cuda/cudart/ulong3.java | 2 +- .../java/org/bytedeco/cuda/cudart/ulong4.java | 2 +- .../org/bytedeco/cuda/cudart/ulonglong1.java | 2 +- .../org/bytedeco/cuda/cudart/ulonglong2.java | 2 +- .../org/bytedeco/cuda/cudart/ulonglong3.java | 2 +- .../org/bytedeco/cuda/cudart/ulonglong4.java | 2 +- .../org/bytedeco/cuda/cudart/ushort1.java | 2 +- .../org/bytedeco/cuda/cudart/ushort2.java | 2 +- .../org/bytedeco/cuda/cudart/ushort3.java | 2 +- .../org/bytedeco/cuda/cudart/ushort4.java | 2 +- .../bytedeco/cuda/cudnn/cudnnAlgorithm_t.java | 2 +- .../cudnnConvolutionBwdDataAlgoPerf_t.java | 2 +- .../cudnnConvolutionBwdFilterAlgoPerf_t.java | 2 +- .../cudnn/cudnnConvolutionFwdAlgoPerf_t.java | 2 +- .../org/bytedeco/cuda/cudnn/cudnnDebug_t.java | 2 +- .../org/bytedeco/cuda/cufftw/fftw_iodim.java | 2 +- .../bytedeco/cuda/cufftw/fftw_iodim64.java | 2 +- .../java/org/bytedeco/cuda/global/cudnn.java | 37 ++-- .../org/bytedeco/cuda/nccl/ncclUniqueId.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp16f.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp16f_2.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp16sc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp16uc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp32fc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp32sc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp32uc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp64fc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp64sc.java | 2 +- .../java/org/bytedeco/cuda/nppc/Npp8uc.java | 2 +- .../bytedeco/cuda/nppc/NppLibraryVersion.java | 2 +- .../org/bytedeco/cuda/nppc/NppPointPolar.java | 2 +- .../bytedeco/cuda/nppc/NppStreamContext.java | 2 +- .../cuda/nppc/NppiBufferDescriptor.java | 2 +- .../nppc/NppiCompressedMarkerLabelsInfo.java | 2 +- .../cuda/nppc/NppiConnectedRegion.java | 2 +- .../nppc/NppiContourPixelDirectionInfo.java | 2 +- .../nppc/NppiContourPixelGeometryInfo.java | 2 +- .../cuda/nppc/NppiContourTotalsInfo.java | 2 +- .../org/bytedeco/cuda/nppc/NppiHOGConfig.java | 2 +- .../bytedeco/cuda/nppc/NppiHaarBuffer.java | 2 +- .../cuda/nppc/NppiHaarClassifier_32f.java | 2 +- .../cuda/nppc/NppiImageDescriptor.java | 2 +- .../org/bytedeco/cuda/nppc/NppiPoint.java | 2 +- .../java/org/bytedeco/cuda/nppc/NppiRect.java | 2 +- .../java/org/bytedeco/cuda/nppc/NppiSize.java | 2 +- .../cuda/nppicc/NppiColorTwistBatchCXR.java | 2 +- .../cuda/nppig/NppiMirrorBatchCXR.java | 2 +- .../cuda/nppig/NppiResizeBatchCXR.java | 2 +- .../nppig/NppiResizeBatchROI_Advanced.java | 2 +- .../cuda/nppig/NppiWarpAffineBatchCXR.java | 2 +- .../nppig/NppiWarpPerspectiveBatchCXR.java | 2 +- .../cuda/nvml/nvmlAccountingStats_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlBAR1Memory_t.java | 2 +- .../cuda/nvml/nvmlBridgeChipHierarchy_t.java | 2 +- .../cuda/nvml/nvmlBridgeChipInfo_t.java | 2 +- .../cuda/nvml/nvmlComputeInstanceInfo_t.java | 2 +- .../nvml/nvmlComputeInstancePlacement_t.java | 2 +- .../nvmlComputeInstanceProfileInfo_t.java | 2 +- .../cuda/nvml/nvmlDeviceAttributes_t.java | 2 +- .../cuda/nvml/nvmlEccErrorCounts_t.java | 2 +- .../cuda/nvml/nvmlEncoderSessionInfo_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlEventData_t.java | 2 +- .../cuda/nvml/nvmlExcludedDeviceInfo_t.java | 2 +- .../cuda/nvml/nvmlFBCSessionInfo_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlFBCStats_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlFieldValue_t.java | 2 +- .../cuda/nvml/nvmlGpuInstanceInfo_t.java | 2 +- .../cuda/nvml/nvmlGpuInstancePlacement_t.java | 2 +- .../nvml/nvmlGpuInstanceProfileInfo_t.java | 2 +- .../nvml/nvmlGridLicensableFeature_t.java | 2 +- .../nvml/nvmlGridLicensableFeatures_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlHwbcEntry_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlLedState_t.java | 2 +- .../org/bytedeco/cuda/nvml/nvmlMemory_t.java | 2 +- .../nvml/nvmlNvLinkUtilizationControl_t.java | 2 +- .../org/bytedeco/cuda/nvml/nvmlPSUInfo_t.java | 2 +- .../org/bytedeco/cuda/nvml/nvmlPciInfo_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlProcessInfo_t.java | 2 +- .../nvml/nvmlProcessUtilizationSample_t.java | 2 +- .../nvmlRowRemapperHistogramValues_t.java | 2 +- .../org/bytedeco/cuda/nvml/nvmlSample_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlUnitFanInfo_t.java | 2 +- .../cuda/nvml/nvmlUnitFanSpeeds_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlUnitInfo_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlUtilization_t.java | 2 +- .../org/bytedeco/cuda/nvml/nvmlValue_t.java | 2 +- .../nvmlVgpuInstanceUtilizationSample_t.java | 2 +- .../cuda/nvml/nvmlVgpuMetadata_t.java | 2 +- .../nvml/nvmlVgpuPgpuCompatibility_t.java | 2 +- .../cuda/nvml/nvmlVgpuPgpuMetadata_t.java | 2 +- .../nvmlVgpuProcessUtilizationSample_t.java | 2 +- .../bytedeco/cuda/nvml/nvmlVgpuVersion_t.java | 2 +- .../cuda/nvml/nvmlViolationTime_t.java | 2 +- dnnl/README.md | 4 +- dnnl/cppbuild.sh | 2 +- dnnl/platform/pom.xml | 2 +- dnnl/pom.xml | 2 +- dnnl/samples/pom.xml | 2 +- .../java/org/bytedeco/dnnl/IntMemoryMap.java | 1 + .../dnnl/batch_normalization_backward.java | 4 +- .../dnnl/batch_normalization_forward.java | 4 +- .../gen/java/org/bytedeco/dnnl/binary.java | 6 +- .../gen/java/org/bytedeco/dnnl/concat.java | 4 +- .../dnnl/convolution_backward_data.java | 4 +- .../dnnl/convolution_backward_weights.java | 4 +- .../bytedeco/dnnl/convolution_forward.java | 4 +- .../dnnl/deconvolution_backward_data.java | 4 +- .../dnnl/deconvolution_backward_weights.java | 4 +- .../bytedeco/dnnl/deconvolution_forward.java | 4 +- .../dnnl/dnnl_batch_normalization_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_binary_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_blocking_desc_t.java | 2 +- .../dnnl/dnnl_convolution_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_eltwise_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_engine_handle.java | 2 +- .../org/bytedeco/dnnl/dnnl_exec_arg_t.java | 2 +- .../dnnl/dnnl_inner_product_desc_t.java | 2 +- .../dnnl/dnnl_layer_normalization_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_lrn_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_matmul_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_memory_desc_t.java | 2 +- .../dnnl/dnnl_memory_extra_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_memory_handle.java | 2 +- .../bytedeco/dnnl/dnnl_pooling_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_pooling_v2_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_post_ops_handle.java | 2 +- .../org/bytedeco/dnnl/dnnl_prelu_desc_t.java | 2 +- .../dnnl/dnnl_primitive_attr_handle.java | 2 +- .../dnnl/dnnl_primitive_desc_handle.java | 2 +- .../bytedeco/dnnl/dnnl_primitive_handle.java | 2 +- .../bytedeco/dnnl/dnnl_reduction_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_resampling_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_rnn_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_rnn_packed_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_shuffle_desc_t.java | 2 +- .../bytedeco/dnnl/dnnl_softmax_desc_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_stream_handle.java | 2 +- .../org/bytedeco/dnnl/dnnl_version_t.java | 2 +- .../org/bytedeco/dnnl/dnnl_wino_desc_t.java | 2 +- .../org/bytedeco/dnnl/eltwise_backward.java | 4 +- .../org/bytedeco/dnnl/eltwise_forward.java | 4 +- .../gen/java/org/bytedeco/dnnl/engine.java | 2 +- .../java/org/bytedeco/dnnl/global/dnnl.java | 2 +- .../java/org/bytedeco/dnnl/gru_backward.java | 4 +- .../java/org/bytedeco/dnnl/gru_forward.java | 4 +- .../dnnl/inner_product_backward_data.java | 4 +- .../dnnl/inner_product_backward_weights.java | 4 +- .../bytedeco/dnnl/inner_product_forward.java | 4 +- .../dnnl/layer_normalization_backward.java | 4 +- .../dnnl/layer_normalization_forward.java | 4 +- .../org/bytedeco/dnnl/lbr_gru_backward.java | 4 +- .../org/bytedeco/dnnl/lbr_gru_forward.java | 4 +- .../bytedeco/dnnl/logsoftmax_backward.java | 6 +- .../org/bytedeco/dnnl/logsoftmax_forward.java | 6 +- .../java/org/bytedeco/dnnl/lrn_backward.java | 4 +- .../java/org/bytedeco/dnnl/lrn_forward.java | 4 +- .../java/org/bytedeco/dnnl/lstm_backward.java | 4 +- .../java/org/bytedeco/dnnl/lstm_forward.java | 4 +- .../gen/java/org/bytedeco/dnnl/matmul.java | 4 +- .../gen/java/org/bytedeco/dnnl/memory.java | 4 +- .../org/bytedeco/dnnl/pooling_backward.java | 4 +- .../org/bytedeco/dnnl/pooling_forward.java | 4 +- .../bytedeco/dnnl/pooling_v2_backward.java | 4 +- .../org/bytedeco/dnnl/pooling_v2_forward.java | 4 +- .../gen/java/org/bytedeco/dnnl/post_ops.java | 2 +- .../org/bytedeco/dnnl/prelu_backward.java | 4 +- .../java/org/bytedeco/dnnl/prelu_forward.java | 4 +- .../gen/java/org/bytedeco/dnnl/primitive.java | 2 +- .../org/bytedeco/dnnl/primitive_attr.java | 2 +- .../org/bytedeco/dnnl/primitive_desc.java | 2 +- .../bytedeco/dnnl/primitive_desc_base.java | 2 +- .../gen/java/org/bytedeco/dnnl/reduction.java | 6 +- .../gen/java/org/bytedeco/dnnl/reorder.java | 4 +- .../bytedeco/dnnl/resampling_backward.java | 4 +- .../org/bytedeco/dnnl/resampling_forward.java | 4 +- .../dnnl/rnn_primitive_desc_base.java | 2 +- .../org/bytedeco/dnnl/shuffle_backward.java | 4 +- .../org/bytedeco/dnnl/shuffle_forward.java | 4 +- .../org/bytedeco/dnnl/softmax_backward.java | 6 +- .../org/bytedeco/dnnl/softmax_forward.java | 6 +- .../gen/java/org/bytedeco/dnnl/stream.java | 2 +- dnnl/src/gen/java/org/bytedeco/dnnl/sum.java | 4 +- .../bytedeco/dnnl/vanilla_rnn_backward.java | 4 +- .../bytedeco/dnnl/vanilla_rnn_forward.java | 4 +- flandmark/pom.xml | 4 +- gsl/platform/pom.xml | 2 +- gsl/pom.xml | 6 +- gym/platform/pom.xml | 2 +- gym/pom.xml | 18 +- mxnet/README.md | 2 +- mxnet/platform/gpu/pom.xml | 2 +- mxnet/platform/pom.xml | 2 +- mxnet/pom.xml | 8 +- mxnet/samples/pom.xml | 2 +- numpy/README.md | 4 +- numpy/cppbuild.sh | 2 +- numpy/platform/pom.xml | 6 +- numpy/pom.xml | 16 +- numpy/samples/pom.xml | 2 +- .../java/org/bytedeco/numpy/NpyAuxData.java | 4 +- .../bytedeco/numpy/NpyAuxData_CloneFunc.java | 2 +- .../bytedeco/numpy/NpyAuxData_FreeFunc.java | 2 +- .../gen/java/org/bytedeco/numpy/NpyIter.java | 2 +- .../numpy/NpyIter_GetMultiIndexFunc.java | 2 +- .../bytedeco/numpy/NpyIter_IterNextFunc.java | 2 +- .../bytedeco/numpy/PyArrayFlagsObject.java | 4 +- .../org/bytedeco/numpy/PyArrayInterface.java | 4 +- .../org/bytedeco/numpy/PyArrayIterObject.java | 4 +- .../bytedeco/numpy/PyArrayMapIterObject.java | 4 +- .../numpy/PyArrayMultiIterObject.java | 4 +- .../numpy/PyArrayNeighborhoodIterObject.java | 4 +- .../org/bytedeco/numpy/PyArrayObject.java | 4 +- .../org/bytedeco/numpy/PyArray_ArgFunc.java | 2 +- .../numpy/PyArray_ArgPartitionFunc.java | 2 +- .../bytedeco/numpy/PyArray_ArgSortFunc.java | 2 +- .../org/bytedeco/numpy/PyArray_ArrFuncs.java | 4 +- .../bytedeco/numpy/PyArray_ArrayDescr.java | 4 +- .../org/bytedeco/numpy/PyArray_Chunk.java | 4 +- .../bytedeco/numpy/PyArray_CompareFunc.java | 2 +- .../bytedeco/numpy/PyArray_CopySwapFunc.java | 2 +- .../bytedeco/numpy/PyArray_CopySwapNFunc.java | 2 +- .../numpy/PyArray_DatetimeDTypeMetaData.java | 4 +- .../numpy/PyArray_DatetimeMetaData.java | 4 +- .../org/bytedeco/numpy/PyArray_Descr.java | 4 +- .../java/org/bytedeco/numpy/PyArray_Dims.java | 4 +- .../org/bytedeco/numpy/PyArray_DotFunc.java | 2 +- .../bytedeco/numpy/PyArray_FastClipFunc.java | 2 +- .../numpy/PyArray_FastPutmaskFunc.java | 2 +- .../bytedeco/numpy/PyArray_FastTakeFunc.java | 2 +- .../org/bytedeco/numpy/PyArray_FillFunc.java | 2 +- .../numpy/PyArray_FillWithScalarFunc.java | 2 +- .../bytedeco/numpy/PyArray_FinalizeFunc.java | 2 +- .../bytedeco/numpy/PyArray_FromStrFunc.java | 2 +- .../bytedeco/numpy/PyArray_GetItemFunc.java | 2 +- .../bytedeco/numpy/PyArray_NonzeroFunc.java | 2 +- .../bytedeco/numpy/PyArray_PartitionFunc.java | 2 +- .../numpy/PyArray_ScalarKindFunc.java | 2 +- .../org/bytedeco/numpy/PyArray_ScanFunc.java | 2 +- .../bytedeco/numpy/PyArray_SetItemFunc.java | 2 +- .../org/bytedeco/numpy/PyArray_SortFunc.java | 2 +- .../numpy/PyArray_VectorUnaryFunc.java | 2 +- .../bytedeco/numpy/PyBoolScalarObject.java | 4 +- .../bytedeco/numpy/PyByteScalarObject.java | 4 +- .../bytedeco/numpy/PyCDoubleScalarObject.java | 4 +- .../bytedeco/numpy/PyCFloatScalarObject.java | 4 +- .../numpy/PyCLongDoubleScalarObject.java | 4 +- .../numpy/PyDataMem_EventHookFunc.java | 2 +- .../numpy/PyDatetimeScalarObject.java | 4 +- .../bytedeco/numpy/PyDoubleScalarObject.java | 4 +- .../bytedeco/numpy/PyFloatScalarObject.java | 4 +- .../bytedeco/numpy/PyHalfScalarObject.java | 4 +- .../org/bytedeco/numpy/PyIntScalarObject.java | 4 +- .../numpy/PyLongDoubleScalarObject.java | 4 +- .../numpy/PyLongLongScalarObject.java | 4 +- .../bytedeco/numpy/PyLongScalarObject.java | 4 +- .../bytedeco/numpy/PyObjectScalarObject.java | 4 +- .../org/bytedeco/numpy/PyScalarObject.java | 4 +- .../bytedeco/numpy/PyShortScalarObject.java | 4 +- .../numpy/PyTimedeltaScalarObject.java | 4 +- .../bytedeco/numpy/PyUByteScalarObject.java | 4 +- .../numpy/PyUFuncGenericFunction.java | 2 +- .../org/bytedeco/numpy/PyUFuncObject.java | 4 +- .../PyUFunc_LegacyInnerLoopSelectionFunc.java | 2 +- .../org/bytedeco/numpy/PyUFunc_Loop1d.java | 4 +- .../PyUFunc_MaskedInnerLoopSelectionFunc.java | 2 +- .../PyUFunc_MaskedStridedInnerLoopFunc.java | 2 +- .../bytedeco/numpy/PyUFunc_PyFuncData.java | 4 +- .../numpy/PyUFunc_TypeResolutionFunc.java | 2 +- .../bytedeco/numpy/PyUIntScalarObject.java | 4 +- .../numpy/PyULongLongScalarObject.java | 4 +- .../bytedeco/numpy/PyULongScalarObject.java | 4 +- .../bytedeco/numpy/PyUShortScalarObject.java | 4 +- .../bytedeco/numpy/PyUnicodeScalarObject.java | 4 +- .../bytedeco/numpy/PyVoidScalarObject.java | 4 +- .../org/bytedeco/numpy/_PyArray_Descr.java | 2 +- .../java/org/bytedeco/numpy/global/numpy.java | 2 +- .../java/org/bytedeco/numpy/npy_cdouble.java | 4 +- .../java/org/bytedeco/numpy/npy_cfloat.java | 4 +- .../org/bytedeco/numpy/npy_clongdouble.java | 4 +- .../bytedeco/numpy/npy_datetimestruct.java | 4 +- .../numpy/npy_iter_get_dataptr_t.java | 2 +- .../bytedeco/numpy/npy_stride_sort_item.java | 4 +- .../bytedeco/numpy/npy_timedeltastruct.java | 4 +- nvcodec/README.md | 2 +- nvcodec/platform/pom.xml | 2 +- nvcodec/pom.xml | 4 +- nvcodec/samples/pom.xml | 2 +- nvcodec/samples/simple/pom.xml | 2 +- onnxruntime/README.md | 2 +- onnxruntime/cppbuild.sh | 2 +- onnxruntime/platform/gpu/pom.xml | 2 +- onnxruntime/platform/pom.xml | 2 +- onnxruntime/pom.xml | 4 +- onnxruntime/samples/pom.xml | 2 +- openblas/OpenBLAS-macosx.patch | 20 +- openblas/README.md | 4 +- openblas/cppbuild.sh | 2 +- openblas/platform/pom.xml | 2 +- openblas/pom.xml | 2 +- openblas/samples/pom.xml | 2 +- .../bytedeco/openblas/global/openblas.java | 184 +++++++++++------- .../openblas/global/openblas_nolapack.java | 2 +- .../openblas/presets/openblas_nolapack.java | 1 + opencv/README.md | 4 +- opencv/platform/gpu/pom.xml | 2 +- opencv/platform/pom.xml | 2 +- opencv/pom.xml | 8 +- opencv/samples/pom.xml | 4 +- .../bytedeco/opencv/global/opencv_mcc.java | 2 +- .../bytedeco/opencv/opencv_aruco/Board.java | 2 +- .../opencv/opencv_aruco/CharucoBoard.java | 2 +- .../opencv_aruco/DetectorParameters.java | 2 +- .../opencv/opencv_aruco/Dictionary.java | 2 +- .../opencv/opencv_aruco/GridBoard.java | 2 +- .../BackgroundSubtractorLSBPDesc.java | 2 +- .../opencv_bioinspired/RetinaParameters.java | 6 +- .../SegmentationParameters.java | 2 +- .../CirclesGridFinderParameters.java | 2 +- .../opencv/opencv_calib3d/CvLevMarq.java | 2 +- .../opencv/opencv_calib3d/UsacParams.java | 2 +- .../opencv/opencv_core/Algorithm.java | 2 +- .../opencv/opencv_core/AsyncArray.java | 2 +- .../bytedeco/opencv/opencv_core/Cv16suf.java | 2 +- .../bytedeco/opencv/opencv_core/Cv32suf.java | 2 +- .../bytedeco/opencv/opencv_core/Cv64suf.java | 2 +- .../bytedeco/opencv/opencv_core/CvBox2D.java | 2 +- .../bytedeco/opencv/opencv_core/CvChain.java | 2 +- .../opencv/opencv_core/CvContour.java | 2 +- .../bytedeco/opencv/opencv_core/CvGraph.java | 2 +- .../opencv/opencv_core/CvGraphEdge.java | 2 +- .../opencv/opencv_core/CvGraphScanner.java | 2 +- .../opencv/opencv_core/CvGraphVtx.java | 2 +- .../opencv/opencv_core/CvGraphVtx2D.java | 2 +- .../opencv/opencv_core/CvHistogram.java | 2 +- .../opencv/opencv_core/CvLineIterator.java | 2 +- .../bytedeco/opencv/opencv_core/CvMat.java | 2 +- .../opencv_core/CvMatDefaultDeleter.java | 2 +- .../bytedeco/opencv/opencv_core/CvMatND.java | 2 +- .../opencv/opencv_core/CvMemBlock.java | 2 +- .../opencv/opencv_core/CvMemStorage.java | 2 +- .../opencv/opencv_core/CvMemStoragePos.java | 2 +- .../opencv/opencv_core/CvNArrayIterator.java | 2 +- .../bytedeco/opencv/opencv_core/CvPoint.java | 2 +- .../opencv/opencv_core/CvPoint2D32f.java | 2 +- .../opencv/opencv_core/CvPoint2D64f.java | 2 +- .../opencv/opencv_core/CvPoint3D32f.java | 2 +- .../opencv/opencv_core/CvPoint3D64f.java | 2 +- .../bytedeco/opencv/opencv_core/CvRect.java | 2 +- .../bytedeco/opencv/opencv_core/CvScalar.java | 2 +- .../bytedeco/opencv/opencv_core/CvSeq.java | 2 +- .../opencv/opencv_core/CvSeqBlock.java | 2 +- .../opencv/opencv_core/CvSeqReader.java | 2 +- .../opencv/opencv_core/CvSeqWriter.java | 2 +- .../bytedeco/opencv/opencv_core/CvSet.java | 2 +- .../opencv/opencv_core/CvSetElem.java | 2 +- .../bytedeco/opencv/opencv_core/CvSize.java | 2 +- .../opencv/opencv_core/CvSize2D32f.java | 2 +- .../bytedeco/opencv/opencv_core/CvSlice.java | 2 +- .../opencv/opencv_core/CvSparseMat.java | 2 +- .../opencv_core/CvSparseMatIterator.java | 2 +- .../opencv/opencv_core/CvSparseNode.java | 2 +- .../opencv/opencv_core/CvTermCriteria.java | 2 +- .../opencv_core/CvTreeNodeIterator.java | 2 +- .../bytedeco/opencv/opencv_core/DMatch.java | 2 +- .../bytedeco/opencv/opencv_core/Device.java | 2 +- .../bytedeco/opencv/opencv_core/FileNode.java | 2 +- .../opencv/opencv_core/FileNodeIterator.java | 2 +- .../opencv/opencv_core/FileStorage.java | 2 +- .../bytedeco/opencv/opencv_core/GpuMat.java | 2 +- .../bytedeco/opencv/opencv_core/GpuMatND.java | 2 +- .../bytedeco/opencv/opencv_core/Hamming.java | 2 +- .../bytedeco/opencv/opencv_core/Image2D.java | 2 +- .../opencv/opencv_core/InstrNode.java | 2 +- .../opencv/opencv_core/IntDoubleMap.java | 1 + .../opencv/opencv_core/IplConvKernel.java | 2 +- .../opencv/opencv_core/IplConvKernelFP.java | 2 +- .../bytedeco/opencv/opencv_core/IplImage.java | 2 +- .../bytedeco/opencv/opencv_core/IplROI.java | 2 +- .../bytedeco/opencv/opencv_core/Kernel.java | 2 +- .../opencv/opencv_core/KernelArg.java | 2 +- .../bytedeco/opencv/opencv_core/KeyPoint.java | 2 +- .../org/bytedeco/opencv/opencv_core/Mat.java | 2 +- .../opencv/opencv_core/MatConstIterator.java | 2 +- .../bytedeco/opencv/opencv_core/MatExpr.java | 2 +- .../opencv/opencv_core/MinProblemSolver.java | 2 +- .../bytedeco/opencv/opencv_core/Moments.java | 2 +- .../opencv/opencv_core/NAryMatIterator.java | 2 +- .../bytedeco/opencv/opencv_core/NodeData.java | 2 +- .../opencv/opencv_core/NodeDataTls.java | 2 +- .../opencv/opencv_core/NodeDataTlsData.java | 2 +- .../opencv/opencv_core/OclPlatform.java | 2 +- .../opencv_core/OpenCLExecutionContext.java | 2 +- .../org/bytedeco/opencv/opencv_core/PCA.java | 2 +- .../opencv/opencv_core/PlatformInfo.java | 2 +- .../bytedeco/opencv/opencv_core/Point.java | 2 +- .../bytedeco/opencv/opencv_core/Point2d.java | 2 +- .../bytedeco/opencv/opencv_core/Point2f.java | 2 +- .../bytedeco/opencv/opencv_core/Point3d.java | 2 +- .../bytedeco/opencv/opencv_core/Point3f.java | 2 +- .../bytedeco/opencv/opencv_core/Point3i.java | 2 +- .../bytedeco/opencv/opencv_core/Program.java | 2 +- .../opencv/opencv_core/ProgramSource.java | 2 +- .../bytedeco/opencv/opencv_core/Queue.java | 2 +- .../bytedeco/opencv/opencv_core/Range.java | 2 +- .../org/bytedeco/opencv/opencv_core/Rect.java | 2 +- .../bytedeco/opencv/opencv_core/Rect2d.java | 2 +- .../bytedeco/opencv/opencv_core/Rect2f.java | 2 +- .../opencv/opencv_core/RotatedRect.java | 2 +- .../org/bytedeco/opencv/opencv_core/SVD.java | 2 +- .../org/bytedeco/opencv/opencv_core/Size.java | 2 +- .../bytedeco/opencv/opencv_core/Size2d.java | 2 +- .../bytedeco/opencv/opencv_core/Size2f.java | 2 +- .../opencv/opencv_core/SparseMat.java | 4 +- .../opencv_core/SparseMatConstIterator.java | 2 +- .../opencv/opencv_core/SparseMatIterator.java | 2 +- .../opencv/opencv_core/TargetArchs.java | 2 +- .../opencv/opencv_core/TermCriteria.java | 2 +- .../opencv/opencv_core/TickMeter.java | 2 +- .../opencv/opencv_dnn/AccumLayer.java | 2 +- .../opencv/opencv_dnn/ConstLayer.java | 2 +- .../opencv/opencv_dnn/CorrelationLayer.java | 2 +- .../opencv_dnn/DataAugmentationLayer.java | 2 +- .../opencv/opencv_dnn/DetectionModel.java | 2 +- .../org/bytedeco/opencv/opencv_dnn/Dict.java | 2 +- .../opencv/opencv_dnn/FlowWarpLayer.java | 2 +- .../org/bytedeco/opencv/opencv_dnn/Layer.java | 2 +- .../opencv/opencv_dnn/LayerParams.java | 2 +- .../org/bytedeco/opencv/opencv_dnn/Model.java | 2 +- .../org/bytedeco/opencv/opencv_dnn/Net.java | 2 +- .../opencv_dnn/TextDetectionModel_DB.java | 2 +- .../opencv_dnn/TextDetectionModel_EAST.java | 2 +- .../opencv_dnn/TextRecognitionModel.java | 2 +- .../opencv_dnn_superres/DnnSuperResImpl.java | 2 +- .../opencv/opencv_face/FacemarkAAM.java | 10 +- .../opencv/opencv_face/FacemarkKazemi.java | 2 +- .../opencv/opencv_face/FacemarkLBF.java | 4 +- .../opencv/opencv_face/StandardCollector.java | 2 +- .../opencv/opencv_features2d/Accumulator.java | 2 +- .../opencv/opencv_features2d/BFMatcher.java | 2 +- .../opencv/opencv_features2d/BRISK.java | 2 +- .../opencv/opencv_features2d/Feature2D.java | 2 +- .../opencv_features2d/FlannBasedMatcher.java | 2 +- .../opencv_features2d/KeyPointsFilter.java | 2 +- .../opencv/opencv_features2d/SIFT.java | 2 +- .../opencv_features2d/SimpleBlobDetector.java | 4 +- .../opencv_flann/AutotunedIndexParams.java | 2 +- .../opencv_flann/CompositeIndexParams.java | 2 +- .../HierarchicalClusteringIndexParams.java | 2 +- .../bytedeco/opencv/opencv_flann/Index.java | 2 +- .../opencv/opencv_flann/IndexParams.java | 2 +- .../opencv_flann/KMeansIndexParams.java | 2 +- .../opencv_flann/LinearIndexParams.java | 2 +- .../opencv/opencv_flann/SearchParams.java | 2 +- .../opencv/opencv_highgui/QtFont.java | 2 +- .../opencv_imgproc/CvChainPtReader.java | 2 +- .../opencv_imgproc/CvConnectedComp.java | 2 +- .../opencv_imgproc/CvConvexityDefect.java | 2 +- .../opencv/opencv_imgproc/CvFont.java | 2 +- .../opencv/opencv_imgproc/CvHuMoments.java | 2 +- .../opencv/opencv_imgproc/CvMoments.java | 2 +- .../opencv/opencv_imgproc/Subdiv2D.java | 2 +- .../org/bytedeco/opencv/opencv_ml/DTrees.java | 4 +- .../bytedeco/opencv/opencv_ml/ParamGrid.java | 2 +- .../opencv_objdetect/CascadeClassifier.java | 2 +- .../DetectionBasedTracker.java | 2 +- .../opencv/opencv_objdetect/DetectionROI.java | 2 +- .../opencv_objdetect/HOGDescriptor.java | 2 +- .../opencv_objdetect/QRCodeDetector.java | 2 +- .../HistogramPhaseUnwrapping.java | 2 +- .../MotionSaliencyBinWangApr2014.java | 2 +- .../opencv_saliency/ObjectnessBING.java | 2 +- .../StaticSaliencyFineGrained.java | 2 +- .../StaticSaliencySpectralResidual.java | 2 +- .../AffineBasedEstimator.java | 2 +- .../AffineBestOf2NearestMatcher.java | 2 +- .../BestOf2NearestMatcher.java | 2 +- .../BestOf2NearestRangeMatcher.java | 2 +- .../opencv/opencv_stitching/Blender.java | 2 +- .../BlocksChannelsCompensator.java | 2 +- .../BlocksGainCompensator.java | 2 +- .../BundleAdjusterAffine.java | 2 +- .../BundleAdjusterAffinePartial.java | 2 +- .../opencv_stitching/BundleAdjusterRay.java | 2 +- .../BundleAdjusterReproj.java | 2 +- .../opencv/opencv_stitching/CameraParams.java | 2 +- ...ompressedRectilinearPortraitProjector.java | 2 +- .../CompressedRectilinearPortraitWarper.java | 2 +- .../CompressedRectilinearProjector.java | 2 +- .../CompressedRectilinearWarper.java | 2 +- .../CylindricalPortraitProjector.java | 2 +- .../CylindricalProjector.java | 2 +- .../opencv_stitching/CylindricalWarper.java | 2 +- .../opencv_stitching/FisheyeProjector.java | 2 +- .../opencv_stitching/FisheyeWarper.java | 2 +- .../opencv_stitching/GraphCutSeamFinder.java | 2 +- .../GraphCutSeamFinderBase.java | 2 +- .../HomographyBasedEstimator.java | 2 +- .../opencv_stitching/ImageFeatures.java | 2 +- .../opencv/opencv_stitching/MatchesInfo.java | 2 +- .../opencv_stitching/MercatorProjector.java | 2 +- .../opencv_stitching/MercatorWarper.java | 2 +- .../opencv_stitching/MultiBandBlender.java | 2 +- .../opencv_stitching/NoBundleAdjuster.java | 2 +- .../NoExposureCompensator.java | 2 +- .../opencv/opencv_stitching/NoSeamFinder.java | 2 +- .../PaniniPortraitProjector.java | 2 +- .../PaniniPortraitWarper.java | 2 +- .../opencv_stitching/PaniniProjector.java | 2 +- .../opencv/opencv_stitching/PaniniWarper.java | 2 +- .../PlanePortraitProjector.java | 2 +- .../opencv_stitching/PlaneProjector.java | 2 +- .../opencv/opencv_stitching/PlaneWarper.java | 2 +- .../opencv_stitching/ProjectorBase.java | 2 +- .../opencv_stitching/PyRotationWarper.java | 2 +- .../SphericalPortraitProjector.java | 2 +- .../opencv_stitching/SphericalProjector.java | 2 +- .../opencv_stitching/SphericalWarper.java | 2 +- .../StereographicProjector.java | 2 +- .../opencv_stitching/StereographicWarper.java | 2 +- .../opencv/opencv_stitching/Stitcher.java | 2 +- .../opencv/opencv_stitching/Timelapser.java | 2 +- .../opencv_stitching/TimelapserCrop.java | 2 +- .../TransverseMercatorProjector.java | 2 +- .../TransverseMercatorWarper.java | 2 +- .../opencv_stitching/VoronoiSeamFinder.java | 2 +- .../GrayCodePattern.java | 2 +- .../SinusoidalPattern.java | 2 +- .../bytedeco/opencv/opencv_text/ERStat.java | 2 +- .../opencv_text/OCRBeamSearchDecoder.java | 4 +- .../opencv/opencv_text/OCRHMMDecoder.java | 4 +- .../AugmentedUnscentedKalmanFilterParams.java | 2 +- .../opencv_tracking/CvFeatureParams.java | 2 +- .../opencv_tracking/CvHOGEvaluator.java | 2 +- .../opencv_tracking/CvHOGFeatureParams.java | 2 +- .../opencv_tracking/CvHaarEvaluator.java | 2 +- .../opencv_tracking/CvHaarFeatureParams.java | 2 +- .../opencv_tracking/CvLBPEvaluator.java | 2 +- .../opencv_tracking/CvLBPFeatureParams.java | 2 +- .../EstimatedGaussDistribution.java | 2 +- .../MatchTemplateDistance.java | 2 +- .../opencv_tracking/SizeTPointVectorMap.java | 1 + .../opencv/opencv_tracking/SizeTTrackMap.java | 1 + .../opencv/opencv_tracking/Track.java | 2 +- .../opencv/opencv_tracking/TrackedObject.java | 2 +- .../opencv/opencv_tracking/TrackerCSRT.java | 2 +- .../opencv/opencv_tracking/TrackerKCF.java | 2 +- .../opencv/opencv_tracking/TrackerParams.java | 2 +- .../UnscentedKalmanFilterParams.java | 2 +- .../WeakClassifierHaarFeature.java | 2 +- .../opencv/opencv_video/KalmanFilter.java | 2 +- .../opencv/opencv_video/TrackerGOTURN.java | 2 +- .../opencv/opencv_video/TrackerMIL.java | 2 +- .../CvCaptureDefaultDeleter.java | 2 +- .../CvVideoWriterDefaultDeleter.java | 2 +- .../opencv/opencv_videoio/VideoWriter.java | 2 +- .../ColorAverageInpainter.java | 2 +- .../opencv_videostab/ColorInpainter.java | 2 +- .../ConsistentMosaicInpainter.java | 2 +- .../opencv_videostab/FastMarchingMethod.java | 2 +- .../GaussianMotionFilter.java | 2 +- .../opencv/opencv_videostab/IFrameSource.java | 2 +- .../opencv_videostab/InpaintingPipeline.java | 2 +- .../opencv/opencv_videostab/LogToStdout.java | 2 +- .../MoreAccurateMotionWobbleSuppressor.java | 2 +- .../opencv_videostab/MotionInpainter.java | 2 +- .../MotionStabilizationPipeline.java | 2 +- .../opencv/opencv_videostab/NullDeblurer.java | 2 +- .../opencv_videostab/NullFrameSource.java | 2 +- .../opencv_videostab/NullInpainter.java | 2 +- .../opencv/opencv_videostab/NullLog.java | 2 +- .../opencv_videostab/NullOutlierRejector.java | 2 +- .../NullWobbleSuppressor.java | 2 +- .../opencv_videostab/OnePassStabilizer.java | 2 +- .../PyrLkOptFlowEstimatorBase.java | 2 +- .../opencv/opencv_videostab/RansacParams.java | 2 +- .../SparsePyrLkOptFlowEstimator.java | 2 +- .../TranslationBasedLocalOutlierRejector.java | 2 +- .../opencv_videostab/TwoPassStabilizer.java | 2 +- .../opencv_videostab/WeightingDeblurer.java | 2 +- .../opencv_wechat_qrcode/WeChatQRCode.java | 2 +- .../opencv/opencv_xfeatures2d/BEBLID.java | 2 +- .../BriefDescriptorExtractor.java | 2 +- .../opencv_xfeatures2d/Elliptic_KeyPoint.java | 2 +- .../opencv/opencv_xfeatures2d/FREAK.java | 2 +- .../HarrisLaplaceFeatureDetector.java | 2 +- .../opencv/opencv_xfeatures2d/LATCH.java | 2 +- .../opencv/opencv_xfeatures2d/LUCID.java | 2 +- .../opencv_xfeatures2d/MSDDetector.java | 2 +- .../opencv_xfeatures2d/StarDetector.java | 2 +- .../bytedeco/opencv/opencv_ximgproc/Box.java | 2 +- .../opencv_ximgproc/ContourFitting.java | 2 +- openpose/pom.xml | 6 +- platform/pom.xml | 12 +- pytorch/README.md | 2 +- pytorch/cppbuild.sh | 2 +- pytorch/platform/gpu/pom.xml | 4 +- pytorch/platform/pom.xml | 4 +- pytorch/pom.xml | 6 +- pytorch/samples/pom.xml | 2 +- scipy/README.md | 4 +- scipy/cppbuild.sh | 2 +- scipy/platform/pom.xml | 4 +- scipy/pom.xml | 14 +- scipy/samples/pom.xml | 2 +- tensorflow/README.md | 2 +- tensorflow/platform/gpu/pom.xml | 2 +- tensorflow/platform/pom.xml | 2 +- tensorflow/platform/python-gpu/pom.xml | 2 +- tensorflow/platform/python/pom.xml | 2 +- tensorflow/pom.xml | 4 +- tensorflow/samples/pom.xml | 2 +- tensorrt/README.md | 2 +- tensorrt/platform/pom.xml | 2 +- tensorrt/pom.xml | 4 +- tensorrt/samples/pom.xml | 2 +- tvm/README.md | 2 +- tvm/platform/gpu/pom.xml | 4 +- tvm/platform/pom.xml | 4 +- tvm/pom.xml | 8 +- tvm/samples/pom.xml | 2 +- 880 files changed, 1216 insertions(+), 1158 deletions(-) diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml index cd16f0f0a9e..6acde6be9dc 100644 --- a/.github/actions/deploy-centos/action.yml +++ b/.github/actions/deploy-centos/action.yml @@ -63,14 +63,14 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then echo Installing CUDA, cuDNN, etc curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda-repo-rhel7-11-3-local-11.3.0_465.19.01-1.x86_64.rpm - curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz + curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/cudnn-11.3-linux-x64-v8.2.0.53.tgz curl -LO https://developer.download.nvidia.com/compute/redist/nccl/v2.9/nccl_2.9.6-1+cuda11.3_x86_64.txz rpm -i --force --ignorearch --nodeps cuda-repo-rhel7-11-3-local-11.3.0_465.19.01-1.x86_64.rpm pushd /var/cuda-repo-rhel7-11-3-local/; rpm -i --force --ignorearch --nodeps cuda*.rpm libc*.rpm libn*.rpm; rm *.rpm; popd ln -sf /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/libcuda.so ln -sf /usr/local/cuda/lib64/stubs/libnvidia-ml.so /usr/local/cuda/lib64/libnvidia-ml.so - tar -hxvf cudnn-11.2-linux-x64-v8.1.1.33.tgz -C /usr/local/ + tar -hxvf cudnn-11.3-linux-x64-v8.2.0.53.tgz -C /usr/local/ tar -hxvf nccl_2.9.6-1+cuda11.3_x86_64.txz --strip-components=1 -C /usr/local/cuda/ mv /usr/local/cuda/lib/* /usr/local/cuda/lib64/ diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index bd0b91f2e13..da2ec487991 100644 --- a/.github/actions/deploy-macosx/action.yml +++ b/.github/actions/deploy-macosx/action.yml @@ -26,12 +26,12 @@ runs: sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libgfortran.4.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libquadmath.0.dylib sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgcc_s.1.dylib - sudo install_name_tool -change /usr/local/Cellar/gcc@7/7.5.0_2/lib/gcc/7/libquadmath.0.dylib @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib - sudo install_name_tool -change /usr/local/Cellar/gcc@7/7.5.0_3/lib/gcc/7/libquadmath.0.dylib @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib + sudo install_name_tool -change $(otool -L /usr/local/lib/gcc/7/libgfortran.4.dylib | grep /usr/local/Cellar/gcc@7/ | cut -f1 -d ' ') @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgomp.1.dylib sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libstdc++.6.dylib sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libquadmath.0.dylib + otool -L /usr/local/lib/gcc/7/*.dylib fi sudo install_name_tool -add_rpath @loader_path/. -id @rpath/libomp.dylib /usr/local/opt/libomp/lib/libomp.dylib diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index 5eb5a9cad94..f408a646b99 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -14,13 +14,13 @@ runs: export ARCH=arm64 export PREFIX=aarch64-linux-gnu export CUDA=cuda-repo-rhel8-11-3-local-11.3.0_465.19.01-1.aarch64.rpm - export CUDNN=cudnn-11.2-linux-aarch64sbsa-v8.1.1.33.tgz + export CUDNN=cudnn-11.3-linux-aarch64sbsa-v8.2.0.53.tgz export NCCL=nccl_2.9.6-1+cuda11.3_aarch64.txz elif [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]]; then export ARCH=ppc64el export PREFIX=powerpc64le-linux-gnu export CUDA=cuda-repo-rhel8-11-3-local-11.3.0_465.19.01-1.ppc64le.rpm - export CUDNN=cudnn-11.2-linux-ppc64le-v8.1.1.33.tgz + export CUDNN=cudnn-11.3-linux-ppc64le-v8.2.0.53.tgz export NCCL=nccl_2.9.6-1+cuda11.3_ppc64le.txz fi echo "ARCH=$ARCH" >> $GITHUB_ENV @@ -85,7 +85,7 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] || [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then echo Installing CUDA, cuDNN, etc curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/$CUDA - curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/$CUDNN + curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/$CUDNN curl -LO https://developer.download.nvidia.com/compute/redist/nccl/v2.9/$NCCL rpm -i --force --ignorearch --nodeps $CUDA diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index 5d8c95bc537..c980cb6d85e 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -69,9 +69,9 @@ runs: if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if not "%CI_DEPLOY_NEED_CUDA%"=="" ( echo Installing CUDA, cuDNN, etc curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda_11.3.0_465.89_win10.exe - curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-windows-x64-v8.1.1.33.zip + curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/cudnn-11.3-windows-x64-v8.2.0.53.zip cuda_11.3.0_465.89_win10.exe -s - unzip cudnn-11.2-windows-x64-v8.1.1.33.zip + unzip cudnn-11.3-windows-x64-v8.2.0.53.zip move cuda\bin\*.dll "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\bin" move cuda\include\*.h "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\include" move cuda\lib\x64\*.lib "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\lib\x64" diff --git a/CHANGELOG.md b/CHANGELOG.md index bc0a5781383..8c627234201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Map `std::vector` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607)) * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017)) * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016)) - * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Spinnaker 2.4.0.143 ([pull #1040](https://github.com/bytedeco/javacpp-presets/pull/1040)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), Arrow 4.0.0, MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0 + * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Spinnaker 2.4.0.143 ([pull #1040](https://github.com/bytedeco/javacpp-presets/pull/1040)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), Arrow 4.0.0, MKL 2021.2, OpenBLAS 0.3.15, DNNL 2.2.2, CPython 3.9.5, NumPy 1.20.3, SciPy 1.6.3, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, cuDNN 8.2.0, NCCL 2.9.6, ONNX 1.9.0 ### March 8, 2021 version 1.5.5 * Bundle LLD executable in presets for LLVM as required by TVM on Windows diff --git a/README.md b/README.md index 1e6e6ca8f15..1444875bbbf 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * MKL 2021.x https://software.intel.com/mkl * MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN * DNNL 2.2.x https://github.com/oneapi-src/oneDNN - * OpenBLAS 0.3.14 http://www.openblas.net/ + * OpenBLAS 0.3.15 http://www.openblas.net/ * ARPACK-NG 3.8.0 https://github.com/opencollab/arpack-ng * CMINPACK 1.3.8 https://github.com/devernay/cminpack * FFTW 3.3.9 http://www.fftw.org/download.html @@ -201,7 +201,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * Caffe 1.0 https://github.com/BVLC/caffe * OpenPose 1.7.0 https://github.com/CMU-Perceptual-Computing-Lab/openpose * CUDA 11.3.x https://developer.nvidia.com/cuda-downloads - * cuDNN 8.1.x https://developer.nvidia.com/cudnn + * cuDNN 8.2.x https://developer.nvidia.com/cudnn * NCCL 2.9.x https://developer.nvidia.com/nccl * NVIDIA Video Codec SDK 11.0.x https://developer.nvidia.com/nvidia-video-codec-sdk * OpenCL 3.0 https://github.com/KhronosGroup/OpenCL-ICD-Loader diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml index 3402d57af28..662c640b15d 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml index c87c1603e99..add6dfa2d3b 100644 --- a/arpack-ng/pom.xml +++ b/arpack-ng/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -45,12 +45,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/caffe/README.md b/caffe/README.md index 54674e591c4..ee8b530f268 100644 --- a/caffe/README.md +++ b/caffe/README.md @@ -60,7 +60,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/caffe/platform/gpu/pom.xml b/caffe/platform/gpu/pom.xml index fdb8ac8a3bc..f1e4e98a80c 100644 --- a/caffe/platform/gpu/pom.xml +++ b/caffe/platform/gpu/pom.xml @@ -34,7 +34,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml index 2dff67faf1b..7158de0f59f 100644 --- a/caffe/platform/pom.xml +++ b/caffe/platform/pom.xml @@ -33,7 +33,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/caffe/pom.xml b/caffe/pom.xml index 5a1e9c84be4..935581fd3d0 100644 --- a/caffe/pom.xml +++ b/caffe/pom.xml @@ -28,7 +28,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -61,7 +61,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -78,7 +78,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/caffe/samples/pom.xml b/caffe/samples/pom.xml index 36428ece028..a589aa6b24f 100644 --- a/caffe/samples/pom.xml +++ b/caffe/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/chilitags/pom.xml b/chilitags/pom.xml index 8d71afc8c20..257857ba2f4 100644 --- a/chilitags/pom.xml +++ b/chilitags/pom.xml @@ -41,7 +41,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -51,7 +51,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index ccd2cc9b1df..6cad41e379e 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/cminpack/pom.xml b/cminpack/pom.xml index 0109220c20b..ebdbc8ecbf7 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/cpython/README.md b/cpython/README.md index c06c5820d3f..2ae42efce01 100644 --- a/cpython/README.md +++ b/cpython/README.md @@ -14,7 +14,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CPython 3.9.4 https://www.python.org/ + * CPython 3.9.5 https://www.python.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cpython-platform - 3.9.4-1.5.6-SNAPSHOT + 3.9.5-1.5.6-SNAPSHOT diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh index 18d862c8f92..97387a0ec8b 100755 --- a/cpython/cppbuild.sh +++ b/cpython/cppbuild.sh @@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then fi OPENSSL=openssl-1.1.1k -CPYTHON_VERSION=3.9.4 +CPYTHON_VERSION=3.9.5 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz diff --git a/cpython/platform/pom.xml b/cpython/platform/pom.xml index 3bcbdbfe5c0..d74758d1507 100644 --- a/cpython/platform/pom.xml +++ b/cpython/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} JavaCPP Presets Platform for CPython diff --git a/cpython/pom.xml b/cpython/pom.xml index 2e2abc97a41..97b821bafcf 100644 --- a/cpython/pom.xml +++ b/cpython/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} JavaCPP Presets for CPython diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml index 08e672d3c30..58b44447566 100644 --- a/cpython/samples/pom.xml +++ b/cpython/samples/pom.xml @@ -12,10 +12,10 @@ org.bytedeco cpython-platform - 3.9.4-1.5.6-SNAPSHOT + 3.9.5-1.5.6-SNAPSHOT - . + ${basedir} diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java index 2bf60257803..07d74e96bc0 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java @@ -32,7 +32,7 @@ public class PyASCIIObject extends Pointer { return (PyASCIIObject)super.position(position); } @Override public PyASCIIObject getPointer(long i) { - return new PyASCIIObject((Pointer)this).position(position + i); + return new PyASCIIObject((Pointer)this).offsetAddress(i); } /* There are 4 forms of Unicode strings: diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java index 7f5f1e3b2c6..87cc664ce61 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java @@ -27,7 +27,7 @@ public class PyAddrPair extends Pointer { return (PyAddrPair)super.position(position); } @Override public PyAddrPair getPointer(long i) { - return new PyAddrPair((Pointer)this).position(position + i); + return new PyAddrPair((Pointer)this).offsetAddress(i); } public native int ap_lower(); public native PyAddrPair ap_lower(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java index c41374eea9f..a773f37fce5 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java @@ -28,7 +28,7 @@ public class PyAsyncGenObject extends Pointer { return (PyAsyncGenObject)super.position(position); } @Override public PyAsyncGenObject getPointer(long i) { - return new PyAsyncGenObject((Pointer)this).position(position + i); + return new PyAsyncGenObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyAsyncGenObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java index 8e938c882d5..816c9ff23ba 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java @@ -26,7 +26,7 @@ public class PyAsyncMethods extends Pointer { return (PyAsyncMethods)super.position(position); } @Override public PyAsyncMethods getPointer(long i) { - return new PyAsyncMethods((Pointer)this).position(position + i); + return new PyAsyncMethods((Pointer)this).offsetAddress(i); } public native unaryfunc am_await(); public native PyAsyncMethods am_await(unaryfunc setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java index 4107f5191e6..09262227c0a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java @@ -26,7 +26,7 @@ public class PyBaseExceptionObject extends Pointer { return (PyBaseExceptionObject)super.position(position); } @Override public PyBaseExceptionObject getPointer(long i) { - return new PyBaseExceptionObject((Pointer)this).position(position + i); + return new PyBaseExceptionObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyBaseExceptionObject ob_base(PyObject setter); public native PyObject dict(); public native PyBaseExceptionObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java index f687257eb0e..16ce289b903 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java @@ -26,7 +26,7 @@ public class PyBufferProcs extends Pointer { return (PyBufferProcs)super.position(position); } @Override public PyBufferProcs getPointer(long i) { - return new PyBufferProcs((Pointer)this).position(position + i); + return new PyBufferProcs((Pointer)this).offsetAddress(i); } public native getbufferproc bf_getbuffer(); public native PyBufferProcs bf_getbuffer(getbufferproc setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java index 47b13b51c73..3dddfc039a8 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java @@ -28,7 +28,7 @@ public class PyByteArrayObject extends Pointer { return (PyByteArrayObject)super.position(position); } @Override public PyByteArrayObject getPointer(long i) { - return new PyByteArrayObject((Pointer)this).position(position + i); + return new PyByteArrayObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyByteArrayObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java index 619b8feeee4..d7daf74d067 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java @@ -27,7 +27,7 @@ public class PyBytesObject extends Pointer { return (PyBytesObject)super.position(position); } @Override public PyBytesObject getPointer(long i) { - return new PyBytesObject((Pointer)this).position(position + i); + return new PyBytesObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyBytesObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java index b21d2fd43da..f46215a2bd9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java @@ -26,7 +26,7 @@ public class PyCFunctionObject extends Pointer { return (PyCFunctionObject)super.position(position); } @Override public PyCFunctionObject getPointer(long i) { - return new PyCFunctionObject((Pointer)this).position(position + i); + return new PyCFunctionObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCFunctionObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCMethodObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCMethodObject.java index 2fd2ae03750..ed1a278014f 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCMethodObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCMethodObject.java @@ -26,7 +26,7 @@ public class PyCMethodObject extends Pointer { return (PyCMethodObject)super.position(position); } @Override public PyCMethodObject getPointer(long i) { - return new PyCMethodObject((Pointer)this).position(position + i); + return new PyCMethodObject((Pointer)this).offsetAddress(i); } public native @ByRef PyCFunctionObject func(); public native PyCMethodObject func(PyCFunctionObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCellObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCellObject.java index 87e7387d286..55372e797b6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCellObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCellObject.java @@ -27,7 +27,7 @@ public class PyCellObject extends Pointer { return (PyCellObject)super.position(position); } @Override public PyCellObject getPointer(long i) { - return new PyCellObject((Pointer)this).position(position + i); + return new PyCellObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCellObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCodeObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCodeObject.java index a22a1667ab6..4b10a3d2e7a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCodeObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCodeObject.java @@ -27,7 +27,7 @@ public class PyCodeObject extends Pointer { return (PyCodeObject)super.position(position); } @Override public PyCodeObject getPointer(long i) { - return new PyCodeObject((Pointer)this).position(position + i); + return new PyCodeObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCodeObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCompactUnicodeObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCompactUnicodeObject.java index c74568d48d3..61243d9d602 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCompactUnicodeObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCompactUnicodeObject.java @@ -29,7 +29,7 @@ public class PyCompactUnicodeObject extends Pointer { return (PyCompactUnicodeObject)super.position(position); } @Override public PyCompactUnicodeObject getPointer(long i) { - return new PyCompactUnicodeObject((Pointer)this).position(position + i); + return new PyCompactUnicodeObject((Pointer)this).offsetAddress(i); } public native @ByRef PyASCIIObject _base(); public native PyCompactUnicodeObject _base(PyASCIIObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCompilerFlags.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCompilerFlags.java index 7dad52313a8..4a9c6ceb2dd 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCompilerFlags.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCompilerFlags.java @@ -27,7 +27,7 @@ public class PyCompilerFlags extends Pointer { return (PyCompilerFlags)super.position(position); } @Override public PyCompilerFlags getPointer(long i) { - return new PyCompilerFlags((Pointer)this).position(position + i); + return new PyCompilerFlags((Pointer)this).offsetAddress(i); } public native int cf_flags(); public native PyCompilerFlags cf_flags(int setter); /* bitmask of CO_xxx flags relevant to future */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyComplexObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyComplexObject.java index 08d2dbd8bef..9010e509b0e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyComplexObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyComplexObject.java @@ -34,7 +34,7 @@ public class PyComplexObject extends Pointer { return (PyComplexObject)super.position(position); } @Override public PyComplexObject getPointer(long i) { - return new PyComplexObject((Pointer)this).position(position + i); + return new PyComplexObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyComplexObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyConfig.java b/cpython/src/gen/java/org/bytedeco/cpython/PyConfig.java index 4517dc34467..5b3bd8a7a15 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyConfig.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyConfig.java @@ -29,7 +29,7 @@ public class PyConfig extends Pointer { return (PyConfig)super.position(position); } @Override public PyConfig getPointer(long i) { - return new PyConfig((Pointer)this).position(position + i); + return new PyConfig((Pointer)this).offsetAddress(i); } public native int _config_init(); public native PyConfig _config_init(int setter); /* _PyConfigInitEnum value */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCoroObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCoroObject.java index 3633f769936..d4dc7bedbb0 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyCoroObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyCoroObject.java @@ -27,7 +27,7 @@ public class PyCoroObject extends Pointer { return (PyCoroObject)super.position(position); } @Override public PyCoroObject getPointer(long i) { - return new PyCoroObject((Pointer)this).position(position + i); + return new PyCoroObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCoroObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_CAPI.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_CAPI.java index 47722532610..27035b4b6ae 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_CAPI.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_CAPI.java @@ -28,7 +28,7 @@ public class PyDateTime_CAPI extends Pointer { return (PyDateTime_CAPI)super.position(position); } @Override public PyDateTime_CAPI getPointer(long i) { - return new PyDateTime_CAPI((Pointer)this).position(position + i); + return new PyDateTime_CAPI((Pointer)this).offsetAddress(i); } /* type objects */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Date.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Date.java index 99edaf8170e..9083ee705ef 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Date.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Date.java @@ -32,7 +32,7 @@ public class PyDateTime_Date extends Pointer { return (PyDateTime_Date)super.position(position); } @Override public PyDateTime_Date getPointer(long i) { - return new PyDateTime_Date((Pointer)this).position(position + i); + return new PyDateTime_Date((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDateTime_Date ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_DateTime.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_DateTime.java index d463dba5442..6135a9c8b72 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_DateTime.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_DateTime.java @@ -26,7 +26,7 @@ public class PyDateTime_DateTime extends Pointer { return (PyDateTime_DateTime)super.position(position); } @Override public PyDateTime_DateTime getPointer(long i) { - return new PyDateTime_DateTime((Pointer)this).position(position + i); + return new PyDateTime_DateTime((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDateTime_DateTime ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Delta.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Delta.java index 8339b607ec8..3b8f5160219 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Delta.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Delta.java @@ -27,7 +27,7 @@ public class PyDateTime_Delta extends Pointer { return (PyDateTime_Delta)super.position(position); } @Override public PyDateTime_Delta getPointer(long i) { - return new PyDateTime_Delta((Pointer)this).position(position + i); + return new PyDateTime_Delta((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDateTime_Delta ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_TZInfo.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_TZInfo.java index d740a0ed1e7..a6ea70f313e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_TZInfo.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_TZInfo.java @@ -26,7 +26,7 @@ public class PyDateTime_TZInfo extends Pointer { return (PyDateTime_TZInfo)super.position(position); } @Override public PyDateTime_TZInfo getPointer(long i) { - return new PyDateTime_TZInfo((Pointer)this).position(position + i); + return new PyDateTime_TZInfo((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDateTime_TZInfo ob_base(PyObject setter); /* a pure abstract base class */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Time.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Time.java index 7d3e970f15b..2faa1c90117 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Time.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDateTime_Time.java @@ -26,7 +26,7 @@ public class PyDateTime_Time extends Pointer { return (PyDateTime_Time)super.position(position); } @Override public PyDateTime_Time getPointer(long i) { - return new PyDateTime_Time((Pointer)this).position(position + i); + return new PyDateTime_Time((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDateTime_Time ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDescrObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDescrObject.java index 3598738432a..8c359dff3c7 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDescrObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDescrObject.java @@ -28,7 +28,7 @@ public class PyDescrObject extends Pointer { return (PyDescrObject)super.position(position); } @Override public PyDescrObject getPointer(long i) { - return new PyDescrObject((Pointer)this).position(position + i); + return new PyDescrObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDescrObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyDictObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyDictObject.java index 4f4683b52ba..f51b4299155 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyDictObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyDictObject.java @@ -29,7 +29,7 @@ public class PyDictObject extends Pointer { return (PyDictObject)super.position(position); } @Override public PyDictObject getPointer(long i) { - return new PyDictObject((Pointer)this).position(position + i); + return new PyDictObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDictObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyFloatObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyFloatObject.java index 74ac7655f3d..927ab4280e3 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyFloatObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyFloatObject.java @@ -28,7 +28,7 @@ public class PyFloatObject extends Pointer { return (PyFloatObject)super.position(position); } @Override public PyFloatObject getPointer(long i) { - return new PyFloatObject((Pointer)this).position(position + i); + return new PyFloatObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyFloatObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyFunctionObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyFunctionObject.java index 816b7c3a181..a8f620d6cf6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyFunctionObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyFunctionObject.java @@ -38,7 +38,7 @@ public class PyFunctionObject extends Pointer { return (PyFunctionObject)super.position(position); } @Override public PyFunctionObject getPointer(long i) { - return new PyFunctionObject((Pointer)this).position(position + i); + return new PyFunctionObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyFunctionObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyFutureFeatures.java b/cpython/src/gen/java/org/bytedeco/cpython/PyFutureFeatures.java index b580799d90c..eb06bfa1cd8 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyFutureFeatures.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyFutureFeatures.java @@ -29,7 +29,7 @@ public class PyFutureFeatures extends Pointer { return (PyFutureFeatures)super.position(position); } @Override public PyFutureFeatures getPointer(long i) { - return new PyFutureFeatures((Pointer)this).position(position + i); + return new PyFutureFeatures((Pointer)this).offsetAddress(i); } public native int ff_features(); public native PyFutureFeatures ff_features(int setter); /* flags set by future statements */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyGenObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyGenObject.java index f1f0f4941bd..6b59aa4f212 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyGenObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyGenObject.java @@ -26,7 +26,7 @@ public class PyGenObject extends Pointer { return (PyGenObject)super.position(position); } @Override public PyGenObject getPointer(long i) { - return new PyGenObject((Pointer)this).position(position + i); + return new PyGenObject((Pointer)this).offsetAddress(i); } /* The gi_ prefix is intended to remind of generator-iterator. */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDef.java b/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDef.java index a3ffa79848a..39a2d2dbf4f 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDef.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDef.java @@ -26,7 +26,7 @@ public class PyGetSetDef extends Pointer { return (PyGetSetDef)super.position(position); } @Override public PyGetSetDef getPointer(long i) { - return new PyGetSetDef((Pointer)this).position(position + i); + return new PyGetSetDef((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native PyGetSetDef name(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDescrObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDescrObject.java index e328bbd6b09..0594d06e597 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDescrObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyGetSetDescrObject.java @@ -26,7 +26,7 @@ public class PyGetSetDescrObject extends Pointer { return (PyGetSetDescrObject)super.position(position); } @Override public PyGetSetDescrObject getPointer(long i) { - return new PyGetSetDescrObject((Pointer)this).position(position + i); + return new PyGetSetDescrObject((Pointer)this).offsetAddress(i); } public native @ByRef PyDescrObject d_common(); public native PyGetSetDescrObject d_common(PyDescrObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyHeapTypeObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyHeapTypeObject.java index efe890478e0..4ffe16c353a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyHeapTypeObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyHeapTypeObject.java @@ -27,7 +27,7 @@ public class PyHeapTypeObject extends Pointer { return (PyHeapTypeObject)super.position(position); } @Override public PyHeapTypeObject getPointer(long i) { - return new PyHeapTypeObject((Pointer)this).position(position + i); + return new PyHeapTypeObject((Pointer)this).offsetAddress(i); } /* Note: there's a dependency on the order of these members diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyImportErrorObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyImportErrorObject.java index 4fd575fbb8e..584a43b01c3 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyImportErrorObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyImportErrorObject.java @@ -26,7 +26,7 @@ public class PyImportErrorObject extends Pointer { return (PyImportErrorObject)super.position(position); } @Override public PyImportErrorObject getPointer(long i) { - return new PyImportErrorObject((Pointer)this).position(position + i); + return new PyImportErrorObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyImportErrorObject ob_base(PyObject setter); public native PyObject dict(); public native PyImportErrorObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyInstanceMethodObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyInstanceMethodObject.java index 169b2a218d6..804468110c2 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyInstanceMethodObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyInstanceMethodObject.java @@ -26,7 +26,7 @@ public class PyInstanceMethodObject extends Pointer { return (PyInstanceMethodObject)super.position(position); } @Override public PyInstanceMethodObject getPointer(long i) { - return new PyInstanceMethodObject((Pointer)this).position(position + i); + return new PyInstanceMethodObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyInstanceMethodObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyListObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyListObject.java index 7b7c6af8276..f9850937d3e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyListObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyListObject.java @@ -27,7 +27,7 @@ public class PyListObject extends Pointer { return (PyListObject)super.position(position); } @Override public PyListObject getPointer(long i) { - return new PyListObject((Pointer)this).position(position + i); + return new PyListObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyListObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMappingMethods.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMappingMethods.java index 7e5b975fdb2..7a194070ea4 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMappingMethods.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMappingMethods.java @@ -26,7 +26,7 @@ public class PyMappingMethods extends Pointer { return (PyMappingMethods)super.position(position); } @Override public PyMappingMethods getPointer(long i) { - return new PyMappingMethods((Pointer)this).position(position + i); + return new PyMappingMethods((Pointer)this).offsetAddress(i); } public native lenfunc mp_length(); public native PyMappingMethods mp_length(lenfunc setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMemAllocatorEx.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMemAllocatorEx.java index 8d78b9cbe92..c31e0e5889f 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMemAllocatorEx.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMemAllocatorEx.java @@ -27,7 +27,7 @@ public class PyMemAllocatorEx extends Pointer { return (PyMemAllocatorEx)super.position(position); } @Override public PyMemAllocatorEx getPointer(long i) { - return new PyMemAllocatorEx((Pointer)this).position(position + i); + return new PyMemAllocatorEx((Pointer)this).offsetAddress(i); } /* user context passed as the first argument to the 4 functions */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDef.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDef.java index 7ead206bf01..f22b1c0a8af 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDef.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDef.java @@ -32,7 +32,7 @@ public class PyMemberDef extends Pointer { return (PyMemberDef)super.position(position); } @Override public PyMemberDef getPointer(long i) { - return new PyMemberDef((Pointer)this).position(position + i); + return new PyMemberDef((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native PyMemberDef name(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDescrObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDescrObject.java index 8751ece024f..0918852c628 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDescrObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMemberDescrObject.java @@ -26,7 +26,7 @@ public class PyMemberDescrObject extends Pointer { return (PyMemberDescrObject)super.position(position); } @Override public PyMemberDescrObject getPointer(long i) { - return new PyMemberDescrObject((Pointer)this).position(position + i); + return new PyMemberDescrObject((Pointer)this).offsetAddress(i); } public native @ByRef PyDescrObject d_common(); public native PyMemberDescrObject d_common(PyDescrObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMemoryViewObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMemoryViewObject.java index b2f89f08488..3f1cb84c138 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMemoryViewObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMemoryViewObject.java @@ -26,7 +26,7 @@ public class PyMemoryViewObject extends Pointer { return (PyMemoryViewObject)super.position(position); } @Override public PyMemoryViewObject getPointer(long i) { - return new PyMemoryViewObject((Pointer)this).position(position + i); + return new PyMemoryViewObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyMemoryViewObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDef.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDef.java index 18eab167a92..3063bd00d92 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDef.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDef.java @@ -26,7 +26,7 @@ public class PyMethodDef extends Pointer { return (PyMethodDef)super.position(position); } @Override public PyMethodDef getPointer(long i) { - return new PyMethodDef((Pointer)this).position(position + i); + return new PyMethodDef((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer ml_name(); public native PyMethodDef ml_name(BytePointer setter); /* The name of the built-in function/method */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDescrObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDescrObject.java index 23c821710de..851826c5173 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDescrObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodDescrObject.java @@ -26,7 +26,7 @@ public class PyMethodDescrObject extends Pointer { return (PyMethodDescrObject)super.position(position); } @Override public PyMethodDescrObject getPointer(long i) { - return new PyMethodDescrObject((Pointer)this).position(position + i); + return new PyMethodDescrObject((Pointer)this).offsetAddress(i); } public native @ByRef PyDescrObject d_common(); public native PyMethodDescrObject d_common(PyDescrObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodObject.java index 8b40787a2b7..b8dbc98c7dc 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyMethodObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyMethodObject.java @@ -27,7 +27,7 @@ public class PyMethodObject extends Pointer { return (PyMethodObject)super.position(position); } @Override public PyMethodObject getPointer(long i) { - return new PyMethodObject((Pointer)this).position(position + i); + return new PyMethodObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyMethodObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef.java b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef.java index 6d1b726bde8..ed88e0d7a3b 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef.java @@ -29,7 +29,7 @@ public class PyModuleDef extends Pointer { return (PyModuleDef)super.position(position); } @Override public PyModuleDef getPointer(long i) { - return new PyModuleDef((Pointer)this).position(position + i); + return new PyModuleDef((Pointer)this).offsetAddress(i); } public native @ByRef PyModuleDef_Base m_base(); public native PyModuleDef m_base(PyModuleDef_Base setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Base.java b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Base.java index ceb78a3f240..8309d7244eb 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Base.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Base.java @@ -27,7 +27,7 @@ public class PyModuleDef_Base extends Pointer { return (PyModuleDef_Base)super.position(position); } @Override public PyModuleDef_Base getPointer(long i) { - return new PyModuleDef_Base((Pointer)this).position(position + i); + return new PyModuleDef_Base((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyModuleDef_Base ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Slot.java b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Slot.java index eeb2d7c6b72..e64331433e3 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Slot.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyModuleDef_Slot.java @@ -27,7 +27,7 @@ public class PyModuleDef_Slot extends Pointer { return (PyModuleDef_Slot)super.position(position); } @Override public PyModuleDef_Slot getPointer(long i) { - return new PyModuleDef_Slot((Pointer)this).position(position + i); + return new PyModuleDef_Slot((Pointer)this).offsetAddress(i); } public native int slot(); public native PyModuleDef_Slot slot(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyNumberMethods.java b/cpython/src/gen/java/org/bytedeco/cpython/PyNumberMethods.java index 4e8ffdf937f..506e74f3e5f 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyNumberMethods.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyNumberMethods.java @@ -28,7 +28,7 @@ public class PyNumberMethods extends Pointer { return (PyNumberMethods)super.position(position); } @Override public PyNumberMethods getPointer(long i) { - return new PyNumberMethods((Pointer)this).position(position + i); + return new PyNumberMethods((Pointer)this).offsetAddress(i); } /* Number implementations must check *both* diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyOSErrorObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyOSErrorObject.java index e84e19ff7ff..cbd09d80290 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyOSErrorObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyOSErrorObject.java @@ -26,7 +26,7 @@ public class PyOSErrorObject extends Pointer { return (PyOSErrorObject)super.position(position); } @Override public PyOSErrorObject getPointer(long i) { - return new PyOSErrorObject((Pointer)this).position(position + i); + return new PyOSErrorObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyOSErrorObject ob_base(PyObject setter); public native PyObject dict(); public native PyOSErrorObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyObject.java index 8acc34ac050..8c548cb081d 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyObject.java @@ -31,7 +31,7 @@ public class PyObject extends Pointer { return (PyObject)super.position(position); } @Override public PyObject getPointer(long i) { - return new PyObject((Pointer)this).position(position + i); + return new PyObject((Pointer)this).offsetAddress(i); } public native @Cast("Py_ssize_t") long ob_refcnt(); public native PyObject ob_refcnt(long setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyObjectArenaAllocator.java b/cpython/src/gen/java/org/bytedeco/cpython/PyObjectArenaAllocator.java index a517939508f..de3f24c4ecf 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyObjectArenaAllocator.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyObjectArenaAllocator.java @@ -28,7 +28,7 @@ public class PyObjectArenaAllocator extends Pointer { return (PyObjectArenaAllocator)super.position(position); } @Override public PyObjectArenaAllocator getPointer(long i) { - return new PyObjectArenaAllocator((Pointer)this).position(position + i); + return new PyObjectArenaAllocator((Pointer)this).offsetAddress(i); } /* user context passed as the first argument to the 2 functions */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyPreConfig.java b/cpython/src/gen/java/org/bytedeco/cpython/PyPreConfig.java index a08e1612a55..bd48d9e1873 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyPreConfig.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyPreConfig.java @@ -29,7 +29,7 @@ public class PyPreConfig extends Pointer { return (PyPreConfig)super.position(position); } @Override public PyPreConfig getPointer(long i) { - return new PyPreConfig((Pointer)this).position(position + i); + return new PyPreConfig((Pointer)this).offsetAddress(i); } public native int _config_init(); public native PyPreConfig _config_init(int setter); /* _PyConfigInitEnum value */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySTEntryObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PySTEntryObject.java index 5b9a2261d4a..ac268613315 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySTEntryObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySTEntryObject.java @@ -26,7 +26,7 @@ public class PySTEntryObject extends Pointer { return (PySTEntryObject)super.position(position); } @Override public PySTEntryObject getPointer(long i) { - return new PySTEntryObject((Pointer)this).position(position + i); + return new PySTEntryObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PySTEntryObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySequenceMethods.java b/cpython/src/gen/java/org/bytedeco/cpython/PySequenceMethods.java index 0e1f5c04e08..8d2dd6f5318 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySequenceMethods.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySequenceMethods.java @@ -26,7 +26,7 @@ public class PySequenceMethods extends Pointer { return (PySequenceMethods)super.position(position); } @Override public PySequenceMethods getPointer(long i) { - return new PySequenceMethods((Pointer)this).position(position + i); + return new PySequenceMethods((Pointer)this).offsetAddress(i); } public native lenfunc sq_length(); public native PySequenceMethods sq_length(lenfunc setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySetObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PySetObject.java index 7df462d2a3c..d7a1c368004 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySetObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySetObject.java @@ -37,7 +37,7 @@ public class PySetObject extends Pointer { return (PySetObject)super.position(position); } @Override public PySetObject getPointer(long i) { - return new PySetObject((Pointer)this).position(position + i); + return new PySetObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PySetObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySliceObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PySliceObject.java index b5412485d2a..94003500f4a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySliceObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySliceObject.java @@ -35,7 +35,7 @@ public class PySliceObject extends Pointer { return (PySliceObject)super.position(position); } @Override public PySliceObject getPointer(long i) { - return new PySliceObject((Pointer)this).position(position + i); + return new PySliceObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PySliceObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyStatus.java b/cpython/src/gen/java/org/bytedeco/cpython/PyStatus.java index 468c7923e2e..c7486625799 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyStatus.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyStatus.java @@ -29,7 +29,7 @@ public class PyStatus extends Pointer { return (PyStatus)super.position(position); } @Override public PyStatus getPointer(long i) { - return new PyStatus((Pointer)this).position(position + i); + return new PyStatus((Pointer)this).offsetAddress(i); } /** enum PyStatus::_type */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyStopIterationObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyStopIterationObject.java index 2ec413ecea6..9e35c384ff9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyStopIterationObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyStopIterationObject.java @@ -26,7 +26,7 @@ public class PyStopIterationObject extends Pointer { return (PyStopIterationObject)super.position(position); } @Override public PyStopIterationObject getPointer(long i) { - return new PyStopIterationObject((Pointer)this).position(position + i); + return new PyStopIterationObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyStopIterationObject ob_base(PyObject setter); public native PyObject dict(); public native PyStopIterationObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Desc.java b/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Desc.java index 92d9ba5ddd0..bdf4a9627d6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Desc.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Desc.java @@ -26,7 +26,7 @@ public class PyStructSequence_Desc extends Pointer { return (PyStructSequence_Desc)super.position(position); } @Override public PyStructSequence_Desc getPointer(long i) { - return new PyStructSequence_Desc((Pointer)this).position(position + i); + return new PyStructSequence_Desc((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native PyStructSequence_Desc name(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Field.java b/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Field.java index fe151f13b95..3f4d90960bf 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Field.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyStructSequence_Field.java @@ -27,7 +27,7 @@ public class PyStructSequence_Field extends Pointer { return (PyStructSequence_Field)super.position(position); } @Override public PyStructSequence_Field getPointer(long i) { - return new PyStructSequence_Field((Pointer)this).position(position + i); + return new PyStructSequence_Field((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native PyStructSequence_Field name(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySyntaxErrorObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PySyntaxErrorObject.java index 36ed107a0b1..fd94a028001 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySyntaxErrorObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySyntaxErrorObject.java @@ -26,7 +26,7 @@ public class PySyntaxErrorObject extends Pointer { return (PySyntaxErrorObject)super.position(position); } @Override public PySyntaxErrorObject getPointer(long i) { - return new PySyntaxErrorObject((Pointer)this).position(position + i); + return new PySyntaxErrorObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PySyntaxErrorObject ob_base(PyObject setter); public native PyObject dict(); public native PySyntaxErrorObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PySystemExitObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PySystemExitObject.java index deb481e4680..9761a1a827a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PySystemExitObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PySystemExitObject.java @@ -26,7 +26,7 @@ public class PySystemExitObject extends Pointer { return (PySystemExitObject)super.position(position); } @Override public PySystemExitObject getPointer(long i) { - return new PySystemExitObject((Pointer)this).position(position + i); + return new PySystemExitObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PySystemExitObject ob_base(PyObject setter); public native PyObject dict(); public native PySystemExitObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyThreadState.java b/cpython/src/gen/java/org/bytedeco/cpython/PyThreadState.java index 672952be0fe..6d962dc1498 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyThreadState.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyThreadState.java @@ -28,7 +28,7 @@ public class PyThreadState extends Pointer { return (PyThreadState)super.position(position); } @Override public PyThreadState getPointer(long i) { - return new PyThreadState((Pointer)this).position(position + i); + return new PyThreadState((Pointer)this).offsetAddress(i); } /* See Python/ceval.c for comments explaining most fields */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyTracebackObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyTracebackObject.java index 255e9f06486..80e2605609a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyTracebackObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyTracebackObject.java @@ -27,7 +27,7 @@ public class PyTracebackObject extends Pointer { return (PyTracebackObject)super.position(position); } @Override public PyTracebackObject getPointer(long i) { - return new PyTracebackObject((Pointer)this).position(position + i); + return new PyTracebackObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyTracebackObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyTryBlock.java b/cpython/src/gen/java/org/bytedeco/cpython/PyTryBlock.java index a87fa5a6666..21ec29b0565 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyTryBlock.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyTryBlock.java @@ -27,7 +27,7 @@ public class PyTryBlock extends Pointer { return (PyTryBlock)super.position(position); } @Override public PyTryBlock getPointer(long i) { - return new PyTryBlock((Pointer)this).position(position + i); + return new PyTryBlock((Pointer)this).offsetAddress(i); } public native int b_type(); public native PyTryBlock b_type(int setter); /* what kind of block this is */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyTupleObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyTupleObject.java index 20e3d97e6ff..a6b3de93309 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyTupleObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyTupleObject.java @@ -27,7 +27,7 @@ public class PyTupleObject extends Pointer { return (PyTupleObject)super.position(position); } @Override public PyTupleObject getPointer(long i) { - return new PyTupleObject((Pointer)this).position(position + i); + return new PyTupleObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyTupleObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyTypeObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyTypeObject.java index 575e4a45018..bd278811d99 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyTypeObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyTypeObject.java @@ -26,7 +26,7 @@ public class PyTypeObject extends Pointer { return (PyTypeObject)super.position(position); } @Override public PyTypeObject getPointer(long i) { - return new PyTypeObject((Pointer)this).position(position + i); + return new PyTypeObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyTypeObject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyType_Slot.java b/cpython/src/gen/java/org/bytedeco/cpython/PyType_Slot.java index 4ee59ad89c1..2297023309f 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyType_Slot.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyType_Slot.java @@ -26,7 +26,7 @@ public class PyType_Slot extends Pointer { return (PyType_Slot)super.position(position); } @Override public PyType_Slot getPointer(long i) { - return new PyType_Slot((Pointer)this).position(position + i); + return new PyType_Slot((Pointer)this).offsetAddress(i); } public native int slot(); public native PyType_Slot slot(int setter); /* slot id, see below */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyType_Spec.java b/cpython/src/gen/java/org/bytedeco/cpython/PyType_Spec.java index c0225521e45..45230128891 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyType_Spec.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyType_Spec.java @@ -26,7 +26,7 @@ public class PyType_Spec extends Pointer { return (PyType_Spec)super.position(position); } @Override public PyType_Spec getPointer(long i) { - return new PyType_Spec((Pointer)this).position(position + i); + return new PyType_Spec((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native PyType_Spec name(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeErrorObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeErrorObject.java index 18495d530e6..3e8412b24b9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeErrorObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeErrorObject.java @@ -26,7 +26,7 @@ public class PyUnicodeErrorObject extends Pointer { return (PyUnicodeErrorObject)super.position(position); } @Override public PyUnicodeErrorObject getPointer(long i) { - return new PyUnicodeErrorObject((Pointer)this).position(position + i); + return new PyUnicodeErrorObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyUnicodeErrorObject ob_base(PyObject setter); public native PyObject dict(); public native PyUnicodeErrorObject dict(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeObject.java index af6cd69620b..c75c09f3393 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyUnicodeObject.java @@ -29,7 +29,7 @@ public class PyUnicodeObject extends Pointer { return (PyUnicodeObject)super.position(position); } @Override public PyUnicodeObject getPointer(long i) { - return new PyUnicodeObject((Pointer)this).position(position + i); + return new PyUnicodeObject((Pointer)this).offsetAddress(i); } public native @ByRef PyCompactUnicodeObject _base(); public native PyUnicodeObject _base(PyCompactUnicodeObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyVarObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyVarObject.java index ccc7ddfc222..c2d817cb6d9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyVarObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyVarObject.java @@ -26,7 +26,7 @@ public class PyVarObject extends Pointer { return (PyVarObject)super.position(position); } @Override public PyVarObject getPointer(long i) { - return new PyVarObject((Pointer)this).position(position + i); + return new PyVarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyVarObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyWideStringList.java b/cpython/src/gen/java/org/bytedeco/cpython/PyWideStringList.java index 4f2e7910bf7..947aa220d28 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyWideStringList.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyWideStringList.java @@ -28,7 +28,7 @@ public class PyWideStringList extends Pointer { return (PyWideStringList)super.position(position); } @Override public PyWideStringList getPointer(long i) { - return new PyWideStringList((Pointer)this).position(position + i); + return new PyWideStringList((Pointer)this).offsetAddress(i); } /* If length is greater than zero, items must be non-NULL diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyWrapperDescrObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyWrapperDescrObject.java index dce694512f4..306f74c0e2a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/PyWrapperDescrObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/PyWrapperDescrObject.java @@ -26,7 +26,7 @@ public class PyWrapperDescrObject extends Pointer { return (PyWrapperDescrObject)super.position(position); } @Override public PyWrapperDescrObject getPointer(long i) { - return new PyWrapperDescrObject((Pointer)this).position(position + i); + return new PyWrapperDescrObject((Pointer)this).offsetAddress(i); } public native @ByRef PyDescrObject d_common(); public native PyWrapperDescrObject d_common(PyDescrObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/Py_buffer.java b/cpython/src/gen/java/org/bytedeco/cpython/Py_buffer.java index 4c9f5c060a0..942ee6abaf4 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/Py_buffer.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/Py_buffer.java @@ -27,7 +27,7 @@ public class Py_buffer extends Pointer { return (Py_buffer)super.position(position); } @Override public Py_buffer getPointer(long i) { - return new Py_buffer((Pointer)this).position(position + i); + return new Py_buffer((Pointer)this).offsetAddress(i); } public native Pointer buf(); public native Py_buffer buf(Pointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/Py_complex.java b/cpython/src/gen/java/org/bytedeco/cpython/Py_complex.java index a931eb75132..61984e69fe6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/Py_complex.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/Py_complex.java @@ -28,7 +28,7 @@ public class Py_complex extends Pointer { return (Py_complex)super.position(position); } @Override public Py_complex getPointer(long i) { - return new Py_complex((Pointer)this).position(position + i); + return new Py_complex((Pointer)this).offsetAddress(i); } public native double real(); public native Py_complex real(double setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyASTOptimizeState.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyASTOptimizeState.java index 2eaaad12594..41efc490835 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyASTOptimizeState.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyASTOptimizeState.java @@ -26,7 +26,7 @@ public class _PyASTOptimizeState extends Pointer { return (_PyASTOptimizeState)super.position(position); } @Override public _PyASTOptimizeState getPointer(long i) { - return new _PyASTOptimizeState((Pointer)this).position(position + i); + return new _PyASTOptimizeState((Pointer)this).offsetAddress(i); } public native int optimize(); public native _PyASTOptimizeState optimize(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyArg_Parser.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyArg_Parser.java index db3b069b9cc..4280a6b2799 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyArg_Parser.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyArg_Parser.java @@ -28,7 +28,7 @@ public class _PyArg_Parser extends Pointer { return (_PyArg_Parser)super.position(position); } @Override public _PyArg_Parser getPointer(long i) { - return new _PyArg_Parser((Pointer)this).position(position + i); + return new _PyArg_Parser((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer format(); public native _PyArg_Parser format(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyBytesWriter.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyBytesWriter.java index bd41d2541fd..cb273b787e0 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyBytesWriter.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyBytesWriter.java @@ -30,7 +30,7 @@ public class _PyBytesWriter extends Pointer { return (_PyBytesWriter)super.position(position); } @Override public _PyBytesWriter getPointer(long i) { - return new _PyBytesWriter((Pointer)this).position(position + i); + return new _PyBytesWriter((Pointer)this).offsetAddress(i); } /* bytes, bytearray or NULL (when the small buffer is used) */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyCrossInterpreterData.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyCrossInterpreterData.java index 19b0c901056..a95efde232d 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyCrossInterpreterData.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyCrossInterpreterData.java @@ -29,7 +29,7 @@ public class _PyCrossInterpreterData extends Pointer { return (_PyCrossInterpreterData)super.position(position); } @Override public _PyCrossInterpreterData getPointer(long i) { - return new _PyCrossInterpreterData((Pointer)this).position(position + i); + return new _PyCrossInterpreterData((Pointer)this).offsetAddress(i); } // data is the cross-interpreter-safe derivation of a Python object diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseDateTime.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseDateTime.java index 68c6cc88ca1..d95a1e87161 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseDateTime.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseDateTime.java @@ -26,7 +26,7 @@ public class _PyDateTime_BaseDateTime extends Pointer { return (_PyDateTime_BaseDateTime)super.position(position); } @Override public _PyDateTime_BaseDateTime getPointer(long i) { - return new _PyDateTime_BaseDateTime((Pointer)this).position(position + i); + return new _PyDateTime_BaseDateTime((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyDateTime_BaseDateTime ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTZInfo.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTZInfo.java index 0b72f02180e..d3af1f2dbe6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTZInfo.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTZInfo.java @@ -30,7 +30,7 @@ public class _PyDateTime_BaseTZInfo extends Pointer { return (_PyDateTime_BaseTZInfo)super.position(position); } @Override public _PyDateTime_BaseTZInfo getPointer(long i) { - return new _PyDateTime_BaseTZInfo((Pointer)this).position(position + i); + return new _PyDateTime_BaseTZInfo((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyDateTime_BaseTZInfo ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTime.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTime.java index 748af426287..8ca259230a6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTime.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyDateTime_BaseTime.java @@ -26,7 +26,7 @@ public class _PyDateTime_BaseTime extends Pointer { return (_PyDateTime_BaseTime)super.position(position); } @Override public _PyDateTime_BaseTime getPointer(long i) { - return new _PyDateTime_BaseTime((Pointer)this).position(position + i); + return new _PyDateTime_BaseTime((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyDateTime_BaseTime ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyDictViewObject.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyDictViewObject.java index d9f743c0cac..6a2f638263d 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyDictViewObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyDictViewObject.java @@ -28,7 +28,7 @@ public class _PyDictViewObject extends Pointer { return (_PyDictViewObject)super.position(position); } @Override public _PyDictViewObject getPointer(long i) { - return new _PyDictViewObject((Pointer)this).position(position + i); + return new _PyDictViewObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyDictViewObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyErr_StackItem.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyErr_StackItem.java index f270fcdbad5..b022f157f17 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyErr_StackItem.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyErr_StackItem.java @@ -27,7 +27,7 @@ public class _PyErr_StackItem extends Pointer { return (_PyErr_StackItem)super.position(position); } @Override public _PyErr_StackItem getPointer(long i) { - return new _PyErr_StackItem((Pointer)this).position(position + i); + return new _PyErr_StackItem((Pointer)this).offsetAddress(i); } /* This struct represents an entry on the exception stack, which is a diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyManagedBufferObject.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyManagedBufferObject.java index d1f8ad403cb..42264c167ab 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyManagedBufferObject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyManagedBufferObject.java @@ -25,7 +25,7 @@ public class _PyManagedBufferObject extends Pointer { return (_PyManagedBufferObject)super.position(position); } @Override public _PyManagedBufferObject getPointer(long i) { - return new _PyManagedBufferObject((Pointer)this).position(position + i); + return new _PyManagedBufferObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyManagedBufferObject ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyUnicodeWriter.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyUnicodeWriter.java index 232559c5f3a..f91946c5989 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyUnicodeWriter.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyUnicodeWriter.java @@ -29,7 +29,7 @@ public class _PyUnicodeWriter extends Pointer { return (_PyUnicodeWriter)super.position(position); } @Override public _PyUnicodeWriter getPointer(long i) { - return new _PyUnicodeWriter((Pointer)this).position(position + i); + return new _PyUnicodeWriter((Pointer)this).offsetAddress(i); } public native PyObject buffer(); public native _PyUnicodeWriter buffer(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_PyWeakReference.java b/cpython/src/gen/java/org/bytedeco/cpython/_PyWeakReference.java index 17a59a640ad..e942c00c2b4 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_PyWeakReference.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_PyWeakReference.java @@ -30,7 +30,7 @@ public class _PyWeakReference extends Pointer { return (_PyWeakReference)super.position(position); } @Override public _PyWeakReference getPointer(long i) { - return new _PyWeakReference((Pointer)this).position(position + i); + return new _PyWeakReference((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native _PyWeakReference ob_base(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_Py_HashSecret_t.java b/cpython/src/gen/java/org/bytedeco/cpython/_Py_HashSecret_t.java index ccddaa472f1..1fc0428c4d9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_Py_HashSecret_t.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_Py_HashSecret_t.java @@ -47,7 +47,7 @@ public class _Py_HashSecret_t extends Pointer { return (_Py_HashSecret_t)super.position(position); } @Override public _Py_HashSecret_t getPointer(long i) { - return new _Py_HashSecret_t((Pointer)this).position(position + i); + return new _Py_HashSecret_t((Pointer)this).offsetAddress(i); } /* ensure 24 bytes */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_Py_Identifier.java b/cpython/src/gen/java/org/bytedeco/cpython/_Py_Identifier.java index b17acba260b..1e8c9679e58 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_Py_Identifier.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_Py_Identifier.java @@ -50,7 +50,7 @@ public class _Py_Identifier extends Pointer { return (_Py_Identifier)super.position(position); } @Override public _Py_Identifier getPointer(long i) { - return new _Py_Identifier((Pointer)this).position(position + i); + return new _Py_Identifier((Pointer)this).offsetAddress(i); } public native _Py_Identifier next(); public native _Py_Identifier next(_Py_Identifier setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_Py_clock_info_t.java b/cpython/src/gen/java/org/bytedeco/cpython/_Py_clock_info_t.java index c371ae0edce..b40e31a27bb 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_Py_clock_info_t.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_Py_clock_info_t.java @@ -28,7 +28,7 @@ public class _Py_clock_info_t extends Pointer { return (_Py_clock_info_t)super.position(position); } @Override public _Py_clock_info_t getPointer(long i) { - return new _Py_clock_info_t((Pointer)this).position(position + i); + return new _Py_clock_info_t((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer implementation(); public native _Py_clock_info_t implementation(BytePointer setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_Py_tss_t.java b/cpython/src/gen/java/org/bytedeco/cpython/_Py_tss_t.java index 975b3fb3093..76ab11dfcea 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_Py_tss_t.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_Py_tss_t.java @@ -31,7 +31,7 @@ public class _Py_tss_t extends Pointer { return (_Py_tss_t)super.position(position); } @Override public _Py_tss_t getPointer(long i) { - return new _Py_tss_t((Pointer)this).position(position + i); + return new _Py_tss_t((Pointer)this).offsetAddress(i); } public native int _is_initialized(); public native _Py_tss_t _is_initialized(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_alias.java b/cpython/src/gen/java/org/bytedeco/cpython/_alias.java index 7db02444b46..a129fd6153b 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_alias.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_alias.java @@ -26,7 +26,7 @@ public class _alias extends Pointer { return (_alias)super.position(position); } @Override public _alias getPointer(long i) { - return new _alias((Pointer)this).position(position + i); + return new _alias((Pointer)this).offsetAddress(i); } public native @Cast("identifier") PyObject name(); public native _alias name(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_arg.java b/cpython/src/gen/java/org/bytedeco/cpython/_arg.java index b134eefdb2f..bdd633f4673 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_arg.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_arg.java @@ -26,7 +26,7 @@ public class _arg extends Pointer { return (_arg)super.position(position); } @Override public _arg getPointer(long i) { - return new _arg((Pointer)this).position(position + i); + return new _arg((Pointer)this).offsetAddress(i); } public native @Cast("identifier") PyObject arg(); public native _arg arg(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_arguments.java b/cpython/src/gen/java/org/bytedeco/cpython/_arguments.java index d7a12f300fa..90bbe3d54e9 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_arguments.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_arguments.java @@ -26,7 +26,7 @@ public class _arguments extends Pointer { return (_arguments)super.position(position); } @Override public _arguments getPointer(long i) { - return new _arguments((Pointer)this).position(position + i); + return new _arguments((Pointer)this).offsetAddress(i); } public native asdl_seq posonlyargs(); public native _arguments posonlyargs(asdl_seq setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_comprehension.java b/cpython/src/gen/java/org/bytedeco/cpython/_comprehension.java index 7ccc95626e6..61ebdc28131 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_comprehension.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_comprehension.java @@ -26,7 +26,7 @@ public class _comprehension extends Pointer { return (_comprehension)super.position(position); } @Override public _comprehension getPointer(long i) { - return new _comprehension((Pointer)this).position(position + i); + return new _comprehension((Pointer)this).offsetAddress(i); } public native _expr target(); public native _comprehension target(_expr setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_excepthandler.java b/cpython/src/gen/java/org/bytedeco/cpython/_excepthandler.java index 2f3af046717..4c29086ed0a 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_excepthandler.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_excepthandler.java @@ -25,7 +25,7 @@ public class _excepthandler extends Pointer { return (_excepthandler)super.position(position); } @Override public _excepthandler getPointer(long i) { - return new _excepthandler((Pointer)this).position(position + i); + return new _excepthandler((Pointer)this).offsetAddress(i); } public native @Cast("_excepthandler_kind") int kind(); public native _excepthandler kind(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_expr.java b/cpython/src/gen/java/org/bytedeco/cpython/_expr.java index ecadbb4e790..1c798e31bea 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_expr.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_expr.java @@ -25,7 +25,7 @@ public class _expr extends Pointer { return (_expr)super.position(position); } @Override public _expr getPointer(long i) { - return new _expr((Pointer)this).position(position + i); + return new _expr((Pointer)this).offsetAddress(i); } public native @Cast("_expr_kind") int kind(); public native _expr kind(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_frame.java b/cpython/src/gen/java/org/bytedeco/cpython/_frame.java index 11dc0330a3e..b19dbfb2072 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_frame.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_frame.java @@ -26,7 +26,7 @@ public class _frame extends Pointer { return (_frame)super.position(position); } @Override public _frame getPointer(long i) { - return new _frame((Pointer)this).position(position + i); + return new _frame((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native _frame ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_frozen.java b/cpython/src/gen/java/org/bytedeco/cpython/_frozen.java index 3a7bb97ab5c..1d8372a178c 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_frozen.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_frozen.java @@ -26,7 +26,7 @@ public class _frozen extends Pointer { return (_frozen)super.position(position); } @Override public _frozen getPointer(long i) { - return new _frozen((Pointer)this).position(position + i); + return new _frozen((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native _frozen name(BytePointer setter); /* ASCII encoded string */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_inittab.java b/cpython/src/gen/java/org/bytedeco/cpython/_inittab.java index f88a6af6385..5c0103c0a03 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_inittab.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_inittab.java @@ -26,7 +26,7 @@ public class _inittab extends Pointer { return (_inittab)super.position(position); } @Override public _inittab getPointer(long i) { - return new _inittab((Pointer)this).position(position + i); + return new _inittab((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native _inittab name(BytePointer setter); /* ASCII encoded string */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_keyword.java b/cpython/src/gen/java/org/bytedeco/cpython/_keyword.java index 87b8de7fa80..3b99de27dce 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_keyword.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_keyword.java @@ -26,7 +26,7 @@ public class _keyword extends Pointer { return (_keyword)super.position(position); } @Override public _keyword getPointer(long i) { - return new _keyword((Pointer)this).position(position + i); + return new _keyword((Pointer)this).offsetAddress(i); } public native @Cast("identifier") PyObject arg(); public native _keyword arg(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_longobject.java b/cpython/src/gen/java/org/bytedeco/cpython/_longobject.java index b4895f8cc67..d9ecead48e6 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_longobject.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_longobject.java @@ -42,7 +42,7 @@ public class _longobject extends Pointer { return (_longobject)super.position(position); } @Override public _longobject getPointer(long i) { - return new _longobject((Pointer)this).position(position + i); + return new _longobject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native _longobject ob_base(PyVarObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_mod.java b/cpython/src/gen/java/org/bytedeco/cpython/_mod.java index 96e1db7aa5e..9ba4a3480df 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_mod.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_mod.java @@ -25,7 +25,7 @@ public class _mod extends Pointer { return (_mod)super.position(position); } @Override public _mod getPointer(long i) { - return new _mod((Pointer)this).position(position + i); + return new _mod((Pointer)this).offsetAddress(i); } public native @Cast("_mod_kind") int kind(); public native _mod kind(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_stmt.java b/cpython/src/gen/java/org/bytedeco/cpython/_stmt.java index ca36e4ebdcf..2afa2bf7d05 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_stmt.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_stmt.java @@ -25,7 +25,7 @@ public class _stmt extends Pointer { return (_stmt)super.position(position); } @Override public _stmt getPointer(long i) { - return new _stmt((Pointer)this).position(position + i); + return new _stmt((Pointer)this).offsetAddress(i); } public native @Cast("_stmt_kind") int kind(); public native _stmt kind(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_type_ignore.java b/cpython/src/gen/java/org/bytedeco/cpython/_type_ignore.java index 2c4aa630d2e..e27933973c5 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_type_ignore.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_type_ignore.java @@ -25,7 +25,7 @@ public class _type_ignore extends Pointer { return (_type_ignore)super.position(position); } @Override public _type_ignore getPointer(long i) { - return new _type_ignore((Pointer)this).position(position + i); + return new _type_ignore((Pointer)this).offsetAddress(i); } public native @Cast("_type_ignore_kind") int kind(); public native _type_ignore kind(int setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/_withitem.java b/cpython/src/gen/java/org/bytedeco/cpython/_withitem.java index 4b7cffb7a51..84d80033f58 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/_withitem.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/_withitem.java @@ -26,7 +26,7 @@ public class _withitem extends Pointer { return (_withitem)super.position(position); } @Override public _withitem getPointer(long i) { - return new _withitem((Pointer)this).position(position + i); + return new _withitem((Pointer)this).offsetAddress(i); } public native _expr context_expr(); public native _withitem context_expr(_expr setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/asdl_int_seq.java b/cpython/src/gen/java/org/bytedeco/cpython/asdl_int_seq.java index 5d28801ce34..f07ce12914e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/asdl_int_seq.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/asdl_int_seq.java @@ -26,7 +26,7 @@ public class asdl_int_seq extends Pointer { return (asdl_int_seq)super.position(position); } @Override public asdl_int_seq getPointer(long i) { - return new asdl_int_seq((Pointer)this).position(position + i); + return new asdl_int_seq((Pointer)this).offsetAddress(i); } public native @Cast("Py_ssize_t") long size(); public native asdl_int_seq size(long setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/asdl_seq.java b/cpython/src/gen/java/org/bytedeco/cpython/asdl_seq.java index 35fc2aeba45..f0b22db199e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/asdl_seq.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/asdl_seq.java @@ -34,7 +34,7 @@ public class asdl_seq extends Pointer { return (asdl_seq)super.position(position); } @Override public asdl_seq getPointer(long i) { - return new asdl_seq((Pointer)this).position(position + i); + return new asdl_seq((Pointer)this).offsetAddress(i); } public native @Cast("Py_ssize_t") long size(); public native asdl_seq size(long setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java index 8a26e4fb29f..8422db82481 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java @@ -199,12 +199,12 @@ There is also (independent) API version information in modsupport.h. /*--start constants--*/ public static final int PY_MAJOR_VERSION = 3; public static final int PY_MINOR_VERSION = 9; -public static final int PY_MICRO_VERSION = 4; +public static final int PY_MICRO_VERSION = 5; public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL; public static final int PY_RELEASE_SERIAL = 0; /* Version as a string */ -public static final String PY_VERSION = "3.9.4"; +public static final String PY_VERSION = "3.9.5"; /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. @@ -15137,6 +15137,8 @@ macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to // #ifndef Py_LIMITED_API // #ifndef PYCTYPE_H // #define PYCTYPE_H +// #ifdef __cplusplus +// #endif public static final int PY_CTF_LOWER = 0x01; public static final int PY_CTF_UPPER = 0x02; @@ -15168,6 +15170,8 @@ macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to // #define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)]) // #define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)]) +// #ifdef __cplusplus +// #endif // #endif /* !PYCTYPE_H */ // #endif /* !Py_LIMITED_API */ diff --git a/cpython/src/gen/java/org/bytedeco/cpython/node.java b/cpython/src/gen/java/org/bytedeco/cpython/node.java index e552ff1d5d0..48aa4cde0fa 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/node.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/node.java @@ -27,7 +27,7 @@ public class node extends Pointer { return (node)super.position(position); } @Override public node getPointer(long i) { - return new node((Pointer)this).position(position + i); + return new node((Pointer)this).offsetAddress(i); } public native short n_type(); public native node n_type(short setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/setentry.java b/cpython/src/gen/java/org/bytedeco/cpython/setentry.java index 7b5de310204..7c4b7d3955d 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/setentry.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/setentry.java @@ -26,7 +26,7 @@ public class setentry extends Pointer { return (setentry)super.position(position); } @Override public setentry getPointer(long i) { - return new setentry((Pointer)this).position(position + i); + return new setentry((Pointer)this).offsetAddress(i); } public native PyObject key(); public native setentry key(PyObject setter); diff --git a/cpython/src/gen/java/org/bytedeco/cpython/symtable.java b/cpython/src/gen/java/org/bytedeco/cpython/symtable.java index ecd7b0bfd95..354b081bdd8 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/symtable.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/symtable.java @@ -26,7 +26,7 @@ public class symtable extends Pointer { return (symtable)super.position(position); } @Override public symtable getPointer(long i) { - return new symtable((Pointer)this).position(position + i); + return new symtable((Pointer)this).offsetAddress(i); } public native PyObject st_filename(); public native symtable st_filename(PyObject setter); /* name of file being compiled, diff --git a/cpython/src/gen/java/org/bytedeco/cpython/wrapperbase.java b/cpython/src/gen/java/org/bytedeco/cpython/wrapperbase.java index c0bc2035c90..2bd9801b01e 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/wrapperbase.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/wrapperbase.java @@ -26,7 +26,7 @@ public class wrapperbase extends Pointer { return (wrapperbase)super.position(position); } @Override public wrapperbase getPointer(long i) { - return new wrapperbase((Pointer)this).position(position + i); + return new wrapperbase((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer name(); public native wrapperbase name(BytePointer setter); diff --git a/cuda/README.md b/cuda/README.md index 2ba585449e3..2d0d83b2c13 100644 --- a/cuda/README.md +++ b/cuda/README.md @@ -24,7 +24,7 @@ Introduction This directory contains the JavaCPP Presets module for: * CUDA 11.3.0 https://developer.nvidia.com/cuda-zone - * cuDNN 8.1.1 https://developer.nvidia.com/cudnn + * cuDNN 8.2.0 https://developer.nvidia.com/cudnn * NCCL 2.9.6 https://developer.nvidia.com/nccl Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -64,14 +64,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/cuda/platform/pom.xml b/cuda/platform/pom.xml index 775b775226d..1f6b5c494cd 100644 --- a/cuda/platform/pom.xml +++ b/cuda/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cuda-platform - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} JavaCPP Presets Platform for CUDA diff --git a/cuda/platform/redist/pom.xml b/cuda/platform/redist/pom.xml index c6e31081ccb..90113886432 100644 --- a/cuda/platform/redist/pom.xml +++ b/cuda/platform/redist/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} JavaCPP Presets Platform Redist for CUDA diff --git a/cuda/pom.xml b/cuda/pom.xml index c1a09080fee..45453cb10fc 100644 --- a/cuda/pom.xml +++ b/cuda/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cuda - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} JavaCPP Presets for CUDA diff --git a/cuda/samples/pom.xml b/cuda/samples/pom.xml index 4017ac39ce8..229c6c024af 100644 --- a/cuda/samples/pom.xml +++ b/cuda/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco cuda-platform - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulAlgo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulAlgo_t.java index f6234e3f245..56640c6eef5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulAlgo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulAlgo_t.java @@ -33,7 +33,7 @@ public class cublasLtMatmulAlgo_t extends Pointer { return (cublasLtMatmulAlgo_t)super.position(position); } @Override public cublasLtMatmulAlgo_t getPointer(long i) { - return new cublasLtMatmulAlgo_t((Pointer)this).position(position + i); + return new cublasLtMatmulAlgo_t((Pointer)this).offsetAddress(i); } public native @Cast("uint64_t") long data(int i); public native cublasLtMatmulAlgo_t data(int i, long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulDescOpaque_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulDescOpaque_t.java index 2c5c06a4b80..16d9980c496 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulDescOpaque_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulDescOpaque_t.java @@ -30,7 +30,7 @@ public class cublasLtMatmulDescOpaque_t extends Pointer { return (cublasLtMatmulDescOpaque_t)super.position(position); } @Override public cublasLtMatmulDescOpaque_t getPointer(long i) { - return new cublasLtMatmulDescOpaque_t((Pointer)this).position(position + i); + return new cublasLtMatmulDescOpaque_t((Pointer)this).offsetAddress(i); } public native @Cast("uint64_t") long data(int i); public native cublasLtMatmulDescOpaque_t data(int i, long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulHeuristicResult_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulHeuristicResult_t.java index 777852c8d8e..51d77a96c7b 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulHeuristicResult_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulHeuristicResult_t.java @@ -32,7 +32,7 @@ public class cublasLtMatmulHeuristicResult_t extends Pointer { return (cublasLtMatmulHeuristicResult_t)super.position(position); } @Override public cublasLtMatmulHeuristicResult_t getPointer(long i) { - return new cublasLtMatmulHeuristicResult_t((Pointer)this).position(position + i); + return new cublasLtMatmulHeuristicResult_t((Pointer)this).offsetAddress(i); } /** Matmul algorithm descriptor. diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulPreferenceOpaque_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulPreferenceOpaque_t.java index d7bc0e42868..efb991b4b17 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulPreferenceOpaque_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatmulPreferenceOpaque_t.java @@ -30,7 +30,7 @@ public class cublasLtMatmulPreferenceOpaque_t extends Pointer { return (cublasLtMatmulPreferenceOpaque_t)super.position(position); } @Override public cublasLtMatmulPreferenceOpaque_t getPointer(long i) { - return new cublasLtMatmulPreferenceOpaque_t((Pointer)this).position(position + i); + return new cublasLtMatmulPreferenceOpaque_t((Pointer)this).offsetAddress(i); } public native @Cast("uint64_t") long data(int i); public native cublasLtMatmulPreferenceOpaque_t data(int i, long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixLayoutOpaque_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixLayoutOpaque_t.java index 836be8a864f..4c446645284 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixLayoutOpaque_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixLayoutOpaque_t.java @@ -30,7 +30,7 @@ public class cublasLtMatrixLayoutOpaque_t extends Pointer { return (cublasLtMatrixLayoutOpaque_t)super.position(position); } @Override public cublasLtMatrixLayoutOpaque_t getPointer(long i) { - return new cublasLtMatrixLayoutOpaque_t((Pointer)this).position(position + i); + return new cublasLtMatrixLayoutOpaque_t((Pointer)this).offsetAddress(i); } public native @Cast("uint64_t") long data(int i); public native cublasLtMatrixLayoutOpaque_t data(int i, long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixTransformDescOpaque_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixTransformDescOpaque_t.java index 7111f45d4c2..ce03110916e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixTransformDescOpaque_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cublas/cublasLtMatrixTransformDescOpaque_t.java @@ -30,7 +30,7 @@ public class cublasLtMatrixTransformDescOpaque_t extends Pointer { return (cublasLtMatrixTransformDescOpaque_t)super.position(position); } @Override public cublasLtMatrixTransformDescOpaque_t getPointer(long i) { - return new cublasLtMatrixTransformDescOpaque_t((Pointer)this).position(position + i); + return new cublasLtMatrixTransformDescOpaque_t((Pointer)this).offsetAddress(i); } public native @Cast("uint64_t") long data(int i); public native cublasLtMatrixTransformDescOpaque_t data(int i, long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY3D_DESCRIPTOR_v2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY3D_DESCRIPTOR_v2.java index 3b0080fcecf..bc07e0a7d8d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY3D_DESCRIPTOR_v2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY3D_DESCRIPTOR_v2.java @@ -29,7 +29,7 @@ public class CUDA_ARRAY3D_DESCRIPTOR_v2 extends Pointer { return (CUDA_ARRAY3D_DESCRIPTOR_v2)super.position(position); } @Override public CUDA_ARRAY3D_DESCRIPTOR_v2 getPointer(long i) { - return new CUDA_ARRAY3D_DESCRIPTOR_v2((Pointer)this).position(position + i); + return new CUDA_ARRAY3D_DESCRIPTOR_v2((Pointer)this).offsetAddress(i); } /** Width of 3D array */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_DESCRIPTOR_v2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_DESCRIPTOR_v2.java index badb29d67ff..2adb9459c85 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_DESCRIPTOR_v2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_DESCRIPTOR_v2.java @@ -29,7 +29,7 @@ public class CUDA_ARRAY_DESCRIPTOR_v2 extends Pointer { return (CUDA_ARRAY_DESCRIPTOR_v2)super.position(position); } @Override public CUDA_ARRAY_DESCRIPTOR_v2 getPointer(long i) { - return new CUDA_ARRAY_DESCRIPTOR_v2((Pointer)this).position(position + i); + return new CUDA_ARRAY_DESCRIPTOR_v2((Pointer)this).offsetAddress(i); } /** Width of array */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_SPARSE_PROPERTIES_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_SPARSE_PROPERTIES_v1.java index 7e8c0a62e75..a62dddcefe6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_SPARSE_PROPERTIES_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_ARRAY_SPARSE_PROPERTIES_v1.java @@ -29,7 +29,7 @@ public class CUDA_ARRAY_SPARSE_PROPERTIES_v1 extends Pointer { return (CUDA_ARRAY_SPARSE_PROPERTIES_v1)super.position(position); } @Override public CUDA_ARRAY_SPARSE_PROPERTIES_v1 getPointer(long i) { - return new CUDA_ARRAY_SPARSE_PROPERTIES_v1((Pointer)this).position(position + i); + return new CUDA_ARRAY_SPARSE_PROPERTIES_v1((Pointer)this).offsetAddress(i); } /** Width of sparse tile in elements */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1.java index 3f88ee7cb3e..d23cd5fa0b8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1 extends Pointer { return (CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1)super.position(position); } @Override public CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1 getPointer(long i) { - return new CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_MEMORY_BUFFER_DESC_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1.java index 448aa52f3b6..f0eba10bb89 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1.java @@ -28,7 +28,7 @@ public class CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1 extends Pointer { return (CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1)super.position(position); } @Override public CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1 getPointer(long i) { - return new CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_MEMORY_HANDLE_DESC_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1.java index 53da56dbd0d..51439010912 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1 extends Pointer { return (CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1)super.position(position); } @Override public CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1 getPointer(long i) { - return new CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1.java index 10150aa405d..1dce448416e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1 extends Pointer { return (CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1)super.position(position); } @Override public CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1 getPointer(long i) { - return new CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1.java index 7538641f11f..dc66192ca53 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1 extends Pointer { return (CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1)super.position(position); } @Override public CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1 getPointer(long i) { - return new CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1.java index 48444c1c445..eca4cfee7cc 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1 extends Pointer { return (CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1)super.position(position); } @Override public CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1 getPointer(long i) { - return new CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1.java index 1e67f4a0a3e..91a4ce7c9ae 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1 extends Pointer { return (CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1)super.position(position); } @Override public CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1 getPointer(long i) { - return new CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1((Pointer)this).offsetAddress(i); } /** Array of external semaphore handles. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1.java index e2a1c59b238..c9cbcdec9ea 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1 extends Pointer { return (CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1)super.position(position); } @Override public CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1 getPointer(long i) { - return new CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1((Pointer)this).offsetAddress(i); } /** Array of external semaphore handles. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_HOST_NODE_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_HOST_NODE_PARAMS_v1.java index 3b1cb9e0791..1f0a44b959a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_HOST_NODE_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_HOST_NODE_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_HOST_NODE_PARAMS_v1 extends Pointer { return (CUDA_HOST_NODE_PARAMS_v1)super.position(position); } @Override public CUDA_HOST_NODE_PARAMS_v1 getPointer(long i) { - return new CUDA_HOST_NODE_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_HOST_NODE_PARAMS_v1((Pointer)this).offsetAddress(i); } /** The function to call when the node executes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_KERNEL_NODE_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_KERNEL_NODE_PARAMS_v1.java index 83fe53338da..14e8a1810c5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_KERNEL_NODE_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_KERNEL_NODE_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_KERNEL_NODE_PARAMS_v1 extends Pointer { return (CUDA_KERNEL_NODE_PARAMS_v1)super.position(position); } @Override public CUDA_KERNEL_NODE_PARAMS_v1 getPointer(long i) { - return new CUDA_KERNEL_NODE_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_KERNEL_NODE_PARAMS_v1((Pointer)this).offsetAddress(i); } /** Kernel to launch */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_LAUNCH_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_LAUNCH_PARAMS_v1.java index be031a53e99..754abbec90c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_LAUNCH_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_LAUNCH_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_LAUNCH_PARAMS_v1 extends Pointer { return (CUDA_LAUNCH_PARAMS_v1)super.position(position); } @Override public CUDA_LAUNCH_PARAMS_v1 getPointer(long i) { - return new CUDA_LAUNCH_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_LAUNCH_PARAMS_v1((Pointer)this).offsetAddress(i); } /** Kernel to launch */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY2D_v2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY2D_v2.java index c2f1ed1105f..10ea14d63ac 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY2D_v2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY2D_v2.java @@ -29,7 +29,7 @@ public class CUDA_MEMCPY2D_v2 extends Pointer { return (CUDA_MEMCPY2D_v2)super.position(position); } @Override public CUDA_MEMCPY2D_v2 getPointer(long i) { - return new CUDA_MEMCPY2D_v2((Pointer)this).position(position + i); + return new CUDA_MEMCPY2D_v2((Pointer)this).offsetAddress(i); } /** Source X in bytes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_PEER_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_PEER_v1.java index 864cb021384..abbd72a917d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_PEER_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_PEER_v1.java @@ -29,7 +29,7 @@ public class CUDA_MEMCPY3D_PEER_v1 extends Pointer { return (CUDA_MEMCPY3D_PEER_v1)super.position(position); } @Override public CUDA_MEMCPY3D_PEER_v1 getPointer(long i) { - return new CUDA_MEMCPY3D_PEER_v1((Pointer)this).position(position + i); + return new CUDA_MEMCPY3D_PEER_v1((Pointer)this).offsetAddress(i); } /** Source X in bytes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_v2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_v2.java index 06c22159e15..53a8adcca02 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_v2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMCPY3D_v2.java @@ -29,7 +29,7 @@ public class CUDA_MEMCPY3D_v2 extends Pointer { return (CUDA_MEMCPY3D_v2)super.position(position); } @Override public CUDA_MEMCPY3D_v2 getPointer(long i) { - return new CUDA_MEMCPY3D_v2((Pointer)this).position(position + i); + return new CUDA_MEMCPY3D_v2((Pointer)this).offsetAddress(i); } /** Source X in bytes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMSET_NODE_PARAMS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMSET_NODE_PARAMS_v1.java index 6285fd16da6..527132f9f77 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMSET_NODE_PARAMS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_MEMSET_NODE_PARAMS_v1.java @@ -29,7 +29,7 @@ public class CUDA_MEMSET_NODE_PARAMS_v1 extends Pointer { return (CUDA_MEMSET_NODE_PARAMS_v1)super.position(position); } @Override public CUDA_MEMSET_NODE_PARAMS_v1 getPointer(long i) { - return new CUDA_MEMSET_NODE_PARAMS_v1((Pointer)this).position(position + i); + return new CUDA_MEMSET_NODE_PARAMS_v1((Pointer)this).offsetAddress(i); } /** Destination device pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1.java index 2036a778dec..6ff68aa0ae0 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1.java @@ -29,7 +29,7 @@ public class CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1 extends Pointer { return (CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1)super.position(position); } @Override public CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1 getPointer(long i) { - return new CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1((Pointer)this).position(position + i); + return new CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long long") long p2pToken(); public native CUDA_POINTER_ATTRIBUTE_P2P_TOKENS_v1 p2pToken(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_DESC_v1.java index aad87f8482a..4e16e06bc93 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_RESOURCE_DESC_v1 extends Pointer { return (CUDA_RESOURCE_DESC_v1)super.position(position); } @Override public CUDA_RESOURCE_DESC_v1 getPointer(long i) { - return new CUDA_RESOURCE_DESC_v1((Pointer)this).position(position + i); + return new CUDA_RESOURCE_DESC_v1((Pointer)this).offsetAddress(i); } /** Resource type */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_VIEW_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_VIEW_DESC_v1.java index 5d93df6ec2a..2b5db9ebbf8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_VIEW_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_RESOURCE_VIEW_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_RESOURCE_VIEW_DESC_v1 extends Pointer { return (CUDA_RESOURCE_VIEW_DESC_v1)super.position(position); } @Override public CUDA_RESOURCE_VIEW_DESC_v1 getPointer(long i) { - return new CUDA_RESOURCE_VIEW_DESC_v1((Pointer)this).position(position + i); + return new CUDA_RESOURCE_VIEW_DESC_v1((Pointer)this).offsetAddress(i); } /** Resource view format */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_TEXTURE_DESC_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_TEXTURE_DESC_v1.java index badd90daa4d..723b3b688dd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_TEXTURE_DESC_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUDA_TEXTURE_DESC_v1.java @@ -29,7 +29,7 @@ public class CUDA_TEXTURE_DESC_v1 extends Pointer { return (CUDA_TEXTURE_DESC_v1)super.position(position); } @Override public CUDA_TEXTURE_DESC_v1 getPointer(long i) { - return new CUDA_TEXTURE_DESC_v1((Pointer)this).position(position + i); + return new CUDA_TEXTURE_DESC_v1((Pointer)this).offsetAddress(i); } /** Address modes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUaccessPolicyWindow_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUaccessPolicyWindow_v1.java index 07fe9b58bca..dcf2fa1151e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUaccessPolicyWindow_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUaccessPolicyWindow_v1.java @@ -38,7 +38,7 @@ public class CUaccessPolicyWindow_v1 extends Pointer { return (CUaccessPolicyWindow_v1)super.position(position); } @Override public CUaccessPolicyWindow_v1 getPointer(long i) { - return new CUaccessPolicyWindow_v1((Pointer)this).position(position + i); + return new CUaccessPolicyWindow_v1((Pointer)this).offsetAddress(i); } /** Starting address of the access policy window. CUDA driver may align it. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUarrayMapInfo_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUarrayMapInfo_v1.java index 452e99ca696..f28ce8a573f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUarrayMapInfo_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUarrayMapInfo_v1.java @@ -29,7 +29,7 @@ public class CUarrayMapInfo_v1 extends Pointer { return (CUarrayMapInfo_v1)super.position(position); } @Override public CUarrayMapInfo_v1 getPointer(long i) { - return new CUarrayMapInfo_v1((Pointer)this).position(position + i); + return new CUarrayMapInfo_v1((Pointer)this).offsetAddress(i); } /** Resource type */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUdevprop_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUdevprop_v1.java index efee3874a7c..86f2fcd0bc4 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUdevprop_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUdevprop_v1.java @@ -29,7 +29,7 @@ public class CUdevprop_v1 extends Pointer { return (CUdevprop_v1)super.position(position); } @Override public CUdevprop_v1 getPointer(long i) { - return new CUdevprop_v1((Pointer)this).position(position + i); + return new CUdevprop_v1((Pointer)this).offsetAddress(i); } /** Maximum number of threads per block */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcEventHandle_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcEventHandle_v1.java index 498f50dc6d8..a1f886dd8ae 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcEventHandle_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcEventHandle_v1.java @@ -29,7 +29,7 @@ public class CUipcEventHandle_v1 extends Pointer { return (CUipcEventHandle_v1)super.position(position); } @Override public CUipcEventHandle_v1 getPointer(long i) { - return new CUipcEventHandle_v1((Pointer)this).position(position + i); + return new CUipcEventHandle_v1((Pointer)this).offsetAddress(i); } public native @Cast("char") byte reserved(int i); public native CUipcEventHandle_v1 reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcMemHandle_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcMemHandle_v1.java index 52d6b5e06cf..dc87b066866 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcMemHandle_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUipcMemHandle_v1.java @@ -29,7 +29,7 @@ public class CUipcMemHandle_v1 extends Pointer { return (CUipcMemHandle_v1)super.position(position); } @Override public CUipcMemHandle_v1 getPointer(long i) { - return new CUipcMemHandle_v1((Pointer)this).position(position + i); + return new CUipcMemHandle_v1((Pointer)this).offsetAddress(i); } public native @Cast("char") byte reserved(int i); public native CUipcMemHandle_v1 reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUkernelNodeAttrValue_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUkernelNodeAttrValue_v1.java index 2b0deab8704..666175dfa6c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUkernelNodeAttrValue_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUkernelNodeAttrValue_v1.java @@ -29,7 +29,7 @@ public class CUkernelNodeAttrValue_v1 extends Pointer { return (CUkernelNodeAttrValue_v1)super.position(position); } @Override public CUkernelNodeAttrValue_v1 getPointer(long i) { - return new CUkernelNodeAttrValue_v1((Pointer)this).position(position + i); + return new CUkernelNodeAttrValue_v1((Pointer)this).offsetAddress(i); } /** Attribute ::CUaccessPolicyWindow. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAccessDesc_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAccessDesc_v1.java index 7e396c4958c..5a8f532656b 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAccessDesc_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAccessDesc_v1.java @@ -29,7 +29,7 @@ public class CUmemAccessDesc_v1 extends Pointer { return (CUmemAccessDesc_v1)super.position(position); } @Override public CUmemAccessDesc_v1 getPointer(long i) { - return new CUmemAccessDesc_v1((Pointer)this).position(position + i); + return new CUmemAccessDesc_v1((Pointer)this).offsetAddress(i); } /** Location on which the request is to change it's accessibility */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAllocationProp_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAllocationProp_v1.java index 134a283a7f0..7395dcdd9bd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAllocationProp_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemAllocationProp_v1.java @@ -29,7 +29,7 @@ public class CUmemAllocationProp_v1 extends Pointer { return (CUmemAllocationProp_v1)super.position(position); } @Override public CUmemAllocationProp_v1 getPointer(long i) { - return new CUmemAllocationProp_v1((Pointer)this).position(position + i); + return new CUmemAllocationProp_v1((Pointer)this).offsetAddress(i); } /** Allocation type */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemLocation_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemLocation_v1.java index 86c7488f1f4..3b791f690de 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemLocation_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemLocation_v1.java @@ -29,7 +29,7 @@ public class CUmemLocation_v1 extends Pointer { return (CUmemLocation_v1)super.position(position); } @Override public CUmemLocation_v1 getPointer(long i) { - return new CUmemLocation_v1((Pointer)this).position(position + i); + return new CUmemLocation_v1((Pointer)this).offsetAddress(i); } /** Specifies the location type, which modifies the meaning of id. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolProps_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolProps_v1.java index bc77ce634ae..bfe9176366c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolProps_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolProps_v1.java @@ -29,7 +29,7 @@ public class CUmemPoolProps_v1 extends Pointer { return (CUmemPoolProps_v1)super.position(position); } @Override public CUmemPoolProps_v1 getPointer(long i) { - return new CUmemPoolProps_v1((Pointer)this).position(position + i); + return new CUmemPoolProps_v1((Pointer)this).offsetAddress(i); } /** Allocation type. Currently must be specified as CU_MEM_ALLOCATION_TYPE_PINNED */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolPtrExportData_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolPtrExportData_v1.java index 9fb6ea06128..27dc13ad504 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolPtrExportData_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUmemPoolPtrExportData_v1.java @@ -29,7 +29,7 @@ public class CUmemPoolPtrExportData_v1 extends Pointer { return (CUmemPoolPtrExportData_v1)super.position(position); } @Override public CUmemPoolPtrExportData_v1 getPointer(long i) { - return new CUmemPoolPtrExportData_v1((Pointer)this).position(position + i); + return new CUmemPoolPtrExportData_v1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte reserved(int i); public native CUmemPoolPtrExportData_v1 reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamAttrValue_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamAttrValue_v1.java index d851b579f5f..ecfc30ca511 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamAttrValue_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamAttrValue_v1.java @@ -29,7 +29,7 @@ public class CUstreamAttrValue_v1 extends Pointer { return (CUstreamAttrValue_v1)super.position(position); } @Override public CUstreamAttrValue_v1 getPointer(long i) { - return new CUstreamAttrValue_v1((Pointer)this).position(position + i); + return new CUstreamAttrValue_v1((Pointer)this).offsetAddress(i); } /** Attribute ::CUaccessPolicyWindow. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamBatchMemOpParams_v1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamBatchMemOpParams_v1.java index 7340e3a8786..8458673eb7a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamBatchMemOpParams_v1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUstreamBatchMemOpParams_v1.java @@ -29,7 +29,7 @@ public class CUstreamBatchMemOpParams_v1 extends Pointer { return (CUstreamBatchMemOpParams_v1)super.position(position); } @Override public CUstreamBatchMemOpParams_v1 getPointer(long i) { - return new CUstreamBatchMemOpParams_v1((Pointer)this).position(position + i); + return new CUstreamBatchMemOpParams_v1((Pointer)this).offsetAddress(i); } public native @Cast("CUstreamBatchMemOpType") int operation(); public native CUstreamBatchMemOpParams_v1 operation(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid.java index 58427a453fe..03c947e6345 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid.java @@ -25,7 +25,7 @@ public class CUuuid extends Pointer { return (CUuuid)super.position(position); } @Override public CUuuid getPointer(long i) { - return new CUuuid((Pointer)this).position(position + i); + return new CUuuid((Pointer)this).offsetAddress(i); } public native @Cast("char") byte bytes(int i); public native CUuuid bytes(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid_st.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid_st.java index 014a943ec66..11fdafd077d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid_st.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/CUuuid_st.java @@ -25,7 +25,7 @@ public class CUuuid_st extends Pointer { return (CUuuid_st)super.position(position); } @Override public CUuuid_st getPointer(long i) { - return new CUuuid_st((Pointer)this).position(position + i); + return new CUuuid_st((Pointer)this).offsetAddress(i); } public native @Cast("char") byte bytes(int i); public native CUuuid_st bytes(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2.java index 32cf634c0b5..7c276598066 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2.java @@ -28,7 +28,7 @@ public class __half2 extends Pointer { return (__half2)super.position(position); } @Override public __half2 getPointer(long i) { - return new __half2((Pointer)this).position(position + i); + return new __half2((Pointer)this).offsetAddress(i); } public native @ByRef __half x(); public native __half2 x(__half setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2_raw.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2_raw.java index bb0fc36533a..8a2de874739 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2_raw.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half2_raw.java @@ -26,7 +26,7 @@ public class __half2_raw extends Pointer { return (__half2_raw)super.position(position); } @Override public __half2_raw getPointer(long i) { - return new __half2_raw((Pointer)this).position(position + i); + return new __half2_raw((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native __half2_raw x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half_raw.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half_raw.java index 7d851e14927..5900e5dd954 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half_raw.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/__half_raw.java @@ -33,7 +33,7 @@ public class __half_raw extends Pointer { return (__half_raw)super.position(position); } @Override public __half_raw getPointer(long i) { - return new __half_raw((Pointer)this).position(position + i); + return new __half_raw((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native __half_raw x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char1.java index 03990e3337d..c65cb47f876 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char1.java @@ -28,7 +28,7 @@ public class char1 extends Pointer { return (char1)super.position(position); } @Override public char1 getPointer(long i) { - return new char1((Pointer)this).position(position + i); + return new char1((Pointer)this).offsetAddress(i); } public native byte x(); public native char1 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char2.java index 2544fa3dd8c..ee0f46ec659 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char2.java @@ -27,7 +27,7 @@ public class char2 extends Pointer { return (char2)super.position(position); } @Override public char2 getPointer(long i) { - return new char2((Pointer)this).position(position + i); + return new char2((Pointer)this).offsetAddress(i); } public native byte x(); public native char2 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char3.java index 44207e797d4..3bb6f34251a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char3.java @@ -26,7 +26,7 @@ public class char3 extends Pointer { return (char3)super.position(position); } @Override public char3 getPointer(long i) { - return new char3((Pointer)this).position(position + i); + return new char3((Pointer)this).offsetAddress(i); } public native byte x(); public native char3 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char4.java index fd2a01d067d..39c479a636c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/char4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/char4.java @@ -26,7 +26,7 @@ public class char4 extends Pointer { return (char4)super.position(position); } @Override public char4 getPointer(long i) { - return new char4((Pointer)this).position(position + i); + return new char4((Pointer)this).offsetAddress(i); } public native byte x(); public native char4 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaAccessPolicyWindow.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaAccessPolicyWindow.java index 4280381eaab..2ab0e643237 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaAccessPolicyWindow.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaAccessPolicyWindow.java @@ -37,7 +37,7 @@ public class cudaAccessPolicyWindow extends Pointer { return (cudaAccessPolicyWindow)super.position(position); } @Override public cudaAccessPolicyWindow getPointer(long i) { - return new cudaAccessPolicyWindow((Pointer)this).position(position + i); + return new cudaAccessPolicyWindow((Pointer)this).offsetAddress(i); } /** Starting address of the access policy window. CUDA driver may align it. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaArraySparseProperties.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaArraySparseProperties.java index ca91660b15c..1c822c649e8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaArraySparseProperties.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaArraySparseProperties.java @@ -29,7 +29,7 @@ public class cudaArraySparseProperties extends Pointer { return (cudaArraySparseProperties)super.position(position); } @Override public cudaArraySparseProperties getPointer(long i) { - return new cudaArraySparseProperties((Pointer)this).position(position + i); + return new cudaArraySparseProperties((Pointer)this).offsetAddress(i); } /** Tile width in elements */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaChannelFormatDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaChannelFormatDesc.java index 64e98284a2d..a867656d8e6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaChannelFormatDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaChannelFormatDesc.java @@ -29,7 +29,7 @@ public class cudaChannelFormatDesc extends Pointer { return (cudaChannelFormatDesc)super.position(position); } @Override public cudaChannelFormatDesc getPointer(long i) { - return new cudaChannelFormatDesc((Pointer)this).position(position + i); + return new cudaChannelFormatDesc((Pointer)this).offsetAddress(i); } /** x */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaDeviceProp.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaDeviceProp.java index fccff578885..9a9930e4cda 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaDeviceProp.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaDeviceProp.java @@ -29,7 +29,7 @@ public class cudaDeviceProp extends Pointer { return (cudaDeviceProp)super.position(position); } @Override public cudaDeviceProp getPointer(long i) { - return new cudaDeviceProp((Pointer)this).position(position + i); + return new cudaDeviceProp((Pointer)this).offsetAddress(i); } /** ASCII string identifying device */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExtent.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExtent.java index 038de875c58..9fdc17c46d3 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExtent.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExtent.java @@ -31,7 +31,7 @@ public class cudaExtent extends Pointer { return (cudaExtent)super.position(position); } @Override public cudaExtent getPointer(long i) { - return new cudaExtent((Pointer)this).position(position + i); + return new cudaExtent((Pointer)this).offsetAddress(i); } /** Width in elements when referring to array memory, in bytes when referring to linear memory */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryBufferDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryBufferDesc.java index 784325602c3..7f1a29cc3b5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryBufferDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryBufferDesc.java @@ -29,7 +29,7 @@ public class cudaExternalMemoryBufferDesc extends Pointer { return (cudaExternalMemoryBufferDesc)super.position(position); } @Override public cudaExternalMemoryBufferDesc getPointer(long i) { - return new cudaExternalMemoryBufferDesc((Pointer)this).position(position + i); + return new cudaExternalMemoryBufferDesc((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryHandleDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryHandleDesc.java index a481c1fe031..90b6a79419d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryHandleDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryHandleDesc.java @@ -29,7 +29,7 @@ public class cudaExternalMemoryHandleDesc extends Pointer { return (cudaExternalMemoryHandleDesc)super.position(position); } @Override public cudaExternalMemoryHandleDesc getPointer(long i) { - return new cudaExternalMemoryHandleDesc((Pointer)this).position(position + i); + return new cudaExternalMemoryHandleDesc((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryMipmappedArrayDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryMipmappedArrayDesc.java index e79f163ab08..4496f8d303f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryMipmappedArrayDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalMemoryMipmappedArrayDesc.java @@ -29,7 +29,7 @@ public class cudaExternalMemoryMipmappedArrayDesc extends Pointer { return (cudaExternalMemoryMipmappedArrayDesc)super.position(position); } @Override public cudaExternalMemoryMipmappedArrayDesc getPointer(long i) { - return new cudaExternalMemoryMipmappedArrayDesc((Pointer)this).position(position + i); + return new cudaExternalMemoryMipmappedArrayDesc((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreHandleDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreHandleDesc.java index e25909a4063..ef914233604 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreHandleDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreHandleDesc.java @@ -29,7 +29,7 @@ public class cudaExternalSemaphoreHandleDesc extends Pointer { return (cudaExternalSemaphoreHandleDesc)super.position(position); } @Override public cudaExternalSemaphoreHandleDesc getPointer(long i) { - return new cudaExternalSemaphoreHandleDesc((Pointer)this).position(position + i); + return new cudaExternalSemaphoreHandleDesc((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalNodeParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalNodeParams.java index 3961f80d44e..3b47431796a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalNodeParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalNodeParams.java @@ -29,7 +29,7 @@ public class cudaExternalSemaphoreSignalNodeParams extends Pointer { return (cudaExternalSemaphoreSignalNodeParams)super.position(position); } @Override public cudaExternalSemaphoreSignalNodeParams getPointer(long i) { - return new cudaExternalSemaphoreSignalNodeParams((Pointer)this).position(position + i); + return new cudaExternalSemaphoreSignalNodeParams((Pointer)this).offsetAddress(i); } /** Array of external semaphore handles. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalParams.java index a7677403bcb..9daba3a2004 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreSignalParams.java @@ -32,7 +32,7 @@ public class cudaExternalSemaphoreSignalParams extends Pointer { return (cudaExternalSemaphoreSignalParams)super.position(position); } @Override public cudaExternalSemaphoreSignalParams getPointer(long i) { - return new cudaExternalSemaphoreSignalParams((Pointer)this).position(position + i); + return new cudaExternalSemaphoreSignalParams((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitNodeParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitNodeParams.java index d0729753e8f..468a61ae6fa 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitNodeParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitNodeParams.java @@ -29,7 +29,7 @@ public class cudaExternalSemaphoreWaitNodeParams extends Pointer { return (cudaExternalSemaphoreWaitNodeParams)super.position(position); } @Override public cudaExternalSemaphoreWaitNodeParams getPointer(long i) { - return new cudaExternalSemaphoreWaitNodeParams((Pointer)this).position(position + i); + return new cudaExternalSemaphoreWaitNodeParams((Pointer)this).offsetAddress(i); } /** Array of external semaphore handles. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitParams.java index 4626b1774c3..0417a73f9ae 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaExternalSemaphoreWaitParams.java @@ -29,7 +29,7 @@ public class cudaExternalSemaphoreWaitParams extends Pointer { return (cudaExternalSemaphoreWaitParams)super.position(position); } @Override public cudaExternalSemaphoreWaitParams getPointer(long i) { - return new cudaExternalSemaphoreWaitParams((Pointer)this).position(position + i); + return new cudaExternalSemaphoreWaitParams((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaFuncAttributes.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaFuncAttributes.java index eca27e6c0da..a8b71edad12 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaFuncAttributes.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaFuncAttributes.java @@ -29,7 +29,7 @@ public class cudaFuncAttributes extends Pointer { return (cudaFuncAttributes)super.position(position); } @Override public cudaFuncAttributes getPointer(long i) { - return new cudaFuncAttributes((Pointer)this).position(position + i); + return new cudaFuncAttributes((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaHostNodeParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaHostNodeParams.java index d1646977bb7..9e9158de678 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaHostNodeParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaHostNodeParams.java @@ -29,7 +29,7 @@ public class cudaHostNodeParams extends Pointer { return (cudaHostNodeParams)super.position(position); } @Override public cudaHostNodeParams getPointer(long i) { - return new cudaHostNodeParams((Pointer)this).position(position + i); + return new cudaHostNodeParams((Pointer)this).offsetAddress(i); } /** The function to call when the node executes */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcEventHandle_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcEventHandle_t.java index da05fb949ed..b4999920160 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcEventHandle_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcEventHandle_t.java @@ -29,7 +29,7 @@ public class cudaIpcEventHandle_t extends Pointer { return (cudaIpcEventHandle_t)super.position(position); } @Override public cudaIpcEventHandle_t getPointer(long i) { - return new cudaIpcEventHandle_t((Pointer)this).position(position + i); + return new cudaIpcEventHandle_t((Pointer)this).offsetAddress(i); } public native @Cast("char") byte reserved(int i); public native cudaIpcEventHandle_t reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcMemHandle_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcMemHandle_t.java index e7697f851dc..5d9f6fd69bc 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcMemHandle_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaIpcMemHandle_t.java @@ -29,7 +29,7 @@ public class cudaIpcMemHandle_t extends Pointer { return (cudaIpcMemHandle_t)super.position(position); } @Override public cudaIpcMemHandle_t getPointer(long i) { - return new cudaIpcMemHandle_t((Pointer)this).position(position + i); + return new cudaIpcMemHandle_t((Pointer)this).offsetAddress(i); } public native @Cast("char") byte reserved(int i); public native cudaIpcMemHandle_t reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeAttrValue.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeAttrValue.java index b8d070603e1..fe011df0fb8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeAttrValue.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeAttrValue.java @@ -29,7 +29,7 @@ public class cudaKernelNodeAttrValue extends Pointer { return (cudaKernelNodeAttrValue)super.position(position); } @Override public cudaKernelNodeAttrValue getPointer(long i) { - return new cudaKernelNodeAttrValue((Pointer)this).position(position + i); + return new cudaKernelNodeAttrValue((Pointer)this).offsetAddress(i); } /** Attribute ::CUaccessPolicyWindow. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeParams.java index 834ba19e705..d97f938fbcf 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaKernelNodeParams.java @@ -29,7 +29,7 @@ public class cudaKernelNodeParams extends Pointer { return (cudaKernelNodeParams)super.position(position); } @Override public cudaKernelNodeParams getPointer(long i) { - return new cudaKernelNodeParams((Pointer)this).position(position + i); + return new cudaKernelNodeParams((Pointer)this).offsetAddress(i); } /** Kernel to launch */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaLaunchParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaLaunchParams.java index 7516dafbf90..76fa7d024e7 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaLaunchParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaLaunchParams.java @@ -29,7 +29,7 @@ public class cudaLaunchParams extends Pointer { return (cudaLaunchParams)super.position(position); } @Override public cudaLaunchParams getPointer(long i) { - return new cudaLaunchParams((Pointer)this).position(position + i); + return new cudaLaunchParams((Pointer)this).offsetAddress(i); } /** Device function symbol */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemAccessDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemAccessDesc.java index 1045129769b..02626c403e8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemAccessDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemAccessDesc.java @@ -29,7 +29,7 @@ public class cudaMemAccessDesc extends Pointer { return (cudaMemAccessDesc)super.position(position); } @Override public cudaMemAccessDesc getPointer(long i) { - return new cudaMemAccessDesc((Pointer)this).position(position + i); + return new cudaMemAccessDesc((Pointer)this).offsetAddress(i); } /** Location on which the request is to change it's accessibility */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemLocation.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemLocation.java index 591bae2a70a..13f50fc81f2 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemLocation.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemLocation.java @@ -31,7 +31,7 @@ public class cudaMemLocation extends Pointer { return (cudaMemLocation)super.position(position); } @Override public cudaMemLocation getPointer(long i) { - return new cudaMemLocation((Pointer)this).position(position + i); + return new cudaMemLocation((Pointer)this).offsetAddress(i); } /** Specifies the location type, which modifies the meaning of id. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolProps.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolProps.java index 3bf837a17b5..16e1a756182 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolProps.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolProps.java @@ -29,7 +29,7 @@ public class cudaMemPoolProps extends Pointer { return (cudaMemPoolProps)super.position(position); } @Override public cudaMemPoolProps getPointer(long i) { - return new cudaMemPoolProps((Pointer)this).position(position + i); + return new cudaMemPoolProps((Pointer)this).offsetAddress(i); } /** Allocation type. Currently must be specified as cudaMemAllocationTypePinned */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolPtrExportData.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolPtrExportData.java index f9046ad2ba7..0237ab9cf46 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolPtrExportData.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemPoolPtrExportData.java @@ -29,7 +29,7 @@ public class cudaMemPoolPtrExportData extends Pointer { return (cudaMemPoolPtrExportData)super.position(position); } @Override public cudaMemPoolPtrExportData getPointer(long i) { - return new cudaMemPoolPtrExportData((Pointer)this).position(position + i); + return new cudaMemPoolPtrExportData((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte reserved(int i); public native cudaMemPoolPtrExportData reserved(int i, byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DParms.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DParms.java index 0cbfa777bbd..3f9b27e4397 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DParms.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DParms.java @@ -29,7 +29,7 @@ public class cudaMemcpy3DParms extends Pointer { return (cudaMemcpy3DParms)super.position(position); } @Override public cudaMemcpy3DParms getPointer(long i) { - return new cudaMemcpy3DParms((Pointer)this).position(position + i); + return new cudaMemcpy3DParms((Pointer)this).offsetAddress(i); } /** Source memory address */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DPeerParms.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DPeerParms.java index ecc47f50fbe..30d8863b0dc 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DPeerParms.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemcpy3DPeerParms.java @@ -29,7 +29,7 @@ public class cudaMemcpy3DPeerParms extends Pointer { return (cudaMemcpy3DPeerParms)super.position(position); } @Override public cudaMemcpy3DPeerParms getPointer(long i) { - return new cudaMemcpy3DPeerParms((Pointer)this).position(position + i); + return new cudaMemcpy3DPeerParms((Pointer)this).offsetAddress(i); } /** Source memory address */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemsetParams.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemsetParams.java index e13fc12b250..108a967c91c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemsetParams.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaMemsetParams.java @@ -29,7 +29,7 @@ public class cudaMemsetParams extends Pointer { return (cudaMemsetParams)super.position(position); } @Override public cudaMemsetParams getPointer(long i) { - return new cudaMemsetParams((Pointer)this).position(position + i); + return new cudaMemsetParams((Pointer)this).offsetAddress(i); } /** Destination device pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPitchedPtr.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPitchedPtr.java index 2e9d6c4636d..1a1e0204240 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPitchedPtr.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPitchedPtr.java @@ -31,7 +31,7 @@ public class cudaPitchedPtr extends Pointer { return (cudaPitchedPtr)super.position(position); } @Override public cudaPitchedPtr getPointer(long i) { - return new cudaPitchedPtr((Pointer)this).position(position + i); + return new cudaPitchedPtr((Pointer)this).offsetAddress(i); } /** Pointer to allocated memory */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPointerAttributes.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPointerAttributes.java index 59c52672e07..333d495af2f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPointerAttributes.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPointerAttributes.java @@ -29,7 +29,7 @@ public class cudaPointerAttributes extends Pointer { return (cudaPointerAttributes)super.position(position); } @Override public cudaPointerAttributes getPointer(long i) { - return new cudaPointerAttributes((Pointer)this).position(position + i); + return new cudaPointerAttributes((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPos.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPos.java index 5c9004d465a..565a476df86 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPos.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaPos.java @@ -31,7 +31,7 @@ public class cudaPos extends Pointer { return (cudaPos)super.position(position); } @Override public cudaPos getPointer(long i) { - return new cudaPos((Pointer)this).position(position + i); + return new cudaPos((Pointer)this).offsetAddress(i); } /** x */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceDesc.java index bb25ca82066..16b81464abe 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceDesc.java @@ -29,7 +29,7 @@ public class cudaResourceDesc extends Pointer { return (cudaResourceDesc)super.position(position); } @Override public cudaResourceDesc getPointer(long i) { - return new cudaResourceDesc((Pointer)this).position(position + i); + return new cudaResourceDesc((Pointer)this).offsetAddress(i); } /** Resource type */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceViewDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceViewDesc.java index 7765c3a3ca2..efd70a71939 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceViewDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaResourceViewDesc.java @@ -29,7 +29,7 @@ public class cudaResourceViewDesc extends Pointer { return (cudaResourceViewDesc)super.position(position); } @Override public cudaResourceViewDesc getPointer(long i) { - return new cudaResourceViewDesc((Pointer)this).position(position + i); + return new cudaResourceViewDesc((Pointer)this).offsetAddress(i); } /** Resource view format */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaStreamAttrValue.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaStreamAttrValue.java index dfbc0ea9bcd..3ff7856f9b4 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaStreamAttrValue.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaStreamAttrValue.java @@ -29,7 +29,7 @@ public class cudaStreamAttrValue extends Pointer { return (cudaStreamAttrValue)super.position(position); } @Override public cudaStreamAttrValue getPointer(long i) { - return new cudaStreamAttrValue((Pointer)this).position(position + i); + return new cudaStreamAttrValue((Pointer)this).offsetAddress(i); } public native @ByRef cudaAccessPolicyWindow accessPolicyWindow(); public native cudaStreamAttrValue accessPolicyWindow(cudaAccessPolicyWindow setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaTextureDesc.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaTextureDesc.java index e64dad76ff4..c525dec2816 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaTextureDesc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/cudaTextureDesc.java @@ -29,7 +29,7 @@ public class cudaTextureDesc extends Pointer { return (cudaTextureDesc)super.position(position); } @Override public cudaTextureDesc getPointer(long i) { - return new cudaTextureDesc((Pointer)this).position(position + i); + return new cudaTextureDesc((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/dim3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/dim3.java index abbbda38d25..1d050dcba26 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/dim3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/dim3.java @@ -29,7 +29,7 @@ public class dim3 extends Pointer { return (dim3)super.position(position); } @Override public dim3 getPointer(long i) { - return new dim3((Pointer)this).position(position + i); + return new dim3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int x(); public native dim3 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double1.java index 6556f2d82e6..5b82f2523b8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double1.java @@ -26,7 +26,7 @@ public class double1 extends Pointer { return (double1)super.position(position); } @Override public double1 getPointer(long i) { - return new double1((Pointer)this).position(position + i); + return new double1((Pointer)this).offsetAddress(i); } public native double x(); public native double1 x(double setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double2.java index a2fc11d15c5..b6c9b5c5a7f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double2.java @@ -26,7 +26,7 @@ public class double2 extends Pointer { return (double2)super.position(position); } @Override public double2 getPointer(long i) { - return new double2((Pointer)this).position(position + i); + return new double2((Pointer)this).offsetAddress(i); } public native double x(); public native double2 x(double setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double3.java index 25345b1f421..93a77b716ea 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double3.java @@ -26,7 +26,7 @@ public class double3 extends Pointer { return (double3)super.position(position); } @Override public double3 getPointer(long i) { - return new double3((Pointer)this).position(position + i); + return new double3((Pointer)this).offsetAddress(i); } public native double x(); public native double3 x(double setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double4.java index 7aa93083c56..6ec192b28fd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/double4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/double4.java @@ -26,7 +26,7 @@ public class double4 extends Pointer { return (double4)super.position(position); } @Override public double4 getPointer(long i) { - return new double4((Pointer)this).position(position + i); + return new double4((Pointer)this).offsetAddress(i); } public native double x(); public native double4 x(double setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float1.java index 928df8bc251..8aa5a75df45 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float1.java @@ -26,7 +26,7 @@ public class float1 extends Pointer { return (float1)super.position(position); } @Override public float1 getPointer(long i) { - return new float1((Pointer)this).position(position + i); + return new float1((Pointer)this).offsetAddress(i); } public native float x(); public native float1 x(float setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float2.java index 71489c4fd5a..1e8fe78b2fd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float2.java @@ -26,7 +26,7 @@ public class float2 extends Pointer { return (float2)super.position(position); } @Override public float2 getPointer(long i) { - return new float2((Pointer)this).position(position + i); + return new float2((Pointer)this).offsetAddress(i); } public native float x(); public native float2 x(float setter); public native float y(); public native float2 y(float setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float3.java index 9f077540084..3bb488321fa 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float3.java @@ -29,7 +29,7 @@ public class float3 extends Pointer { return (float3)super.position(position); } @Override public float3 getPointer(long i) { - return new float3((Pointer)this).position(position + i); + return new float3((Pointer)this).offsetAddress(i); } public native float x(); public native float3 x(float setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float4.java index a850f9b6e80..90b80bef04d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/float4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/float4.java @@ -26,7 +26,7 @@ public class float4 extends Pointer { return (float4)super.position(position); } @Override public float4 getPointer(long i) { - return new float4((Pointer)this).position(position + i); + return new float4((Pointer)this).offsetAddress(i); } public native float x(); public native float4 x(float setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int1.java index 3920ec60056..f88e24980a2 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int1.java @@ -26,7 +26,7 @@ public class int1 extends Pointer { return (int1)super.position(position); } @Override public int1 getPointer(long i) { - return new int1((Pointer)this).position(position + i); + return new int1((Pointer)this).offsetAddress(i); } public native int x(); public native int1 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int2.java index bd9caf65e6e..7913601b760 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int2.java @@ -26,7 +26,7 @@ public class int2 extends Pointer { return (int2)super.position(position); } @Override public int2 getPointer(long i) { - return new int2((Pointer)this).position(position + i); + return new int2((Pointer)this).offsetAddress(i); } public native int x(); public native int2 x(int setter); public native int y(); public native int2 y(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int3.java index af2bb7959b1..ce559ddf6c3 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int3.java @@ -26,7 +26,7 @@ public class int3 extends Pointer { return (int3)super.position(position); } @Override public int3 getPointer(long i) { - return new int3((Pointer)this).position(position + i); + return new int3((Pointer)this).offsetAddress(i); } public native int x(); public native int3 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int4.java index a26646de273..7e212ec6ffa 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/int4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/int4.java @@ -26,7 +26,7 @@ public class int4 extends Pointer { return (int4)super.position(position); } @Override public int4 getPointer(long i) { - return new int4((Pointer)this).position(position + i); + return new int4((Pointer)this).offsetAddress(i); } public native int x(); public native int4 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long1.java index 628f3670c4d..2251aab7388 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long1.java @@ -26,7 +26,7 @@ public class long1 extends Pointer { return (long1)super.position(position); } @Override public long1 getPointer(long i) { - return new long1((Pointer)this).position(position + i); + return new long1((Pointer)this).offsetAddress(i); } public native long x(); public native long1 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long2.java index f9f1b829bfc..fa5d0917231 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long2.java @@ -27,7 +27,7 @@ public class long2 extends Pointer { return (long2)super.position(position); } @Override public long2 getPointer(long i) { - return new long2((Pointer)this).position(position + i); + return new long2((Pointer)this).offsetAddress(i); } public native long x(); public native long2 x(long setter); public native long y(); public native long2 y(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long3.java index b5968fa932f..dc73c1ee0db 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long3.java @@ -28,7 +28,7 @@ public class long3 extends Pointer { return (long3)super.position(position); } @Override public long3 getPointer(long i) { - return new long3((Pointer)this).position(position + i); + return new long3((Pointer)this).offsetAddress(i); } public native long x(); public native long3 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long4.java index 7a43ad3f541..5ca4848dc21 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/long4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/long4.java @@ -26,7 +26,7 @@ public class long4 extends Pointer { return (long4)super.position(position); } @Override public long4 getPointer(long i) { - return new long4((Pointer)this).position(position + i); + return new long4((Pointer)this).offsetAddress(i); } public native long x(); public native long4 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong1.java index 21b26d56e0f..21253214e90 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong1.java @@ -26,7 +26,7 @@ public class longlong1 extends Pointer { return (longlong1)super.position(position); } @Override public longlong1 getPointer(long i) { - return new longlong1((Pointer)this).position(position + i); + return new longlong1((Pointer)this).offsetAddress(i); } public native long x(); public native longlong1 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong2.java index 13f6ee58102..f20b061ca65 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong2.java @@ -26,7 +26,7 @@ public class longlong2 extends Pointer { return (longlong2)super.position(position); } @Override public longlong2 getPointer(long i) { - return new longlong2((Pointer)this).position(position + i); + return new longlong2((Pointer)this).offsetAddress(i); } public native long x(); public native longlong2 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong3.java index 321bb1f84bd..57dc1b45433 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong3.java @@ -26,7 +26,7 @@ public class longlong3 extends Pointer { return (longlong3)super.position(position); } @Override public longlong3 getPointer(long i) { - return new longlong3((Pointer)this).position(position + i); + return new longlong3((Pointer)this).offsetAddress(i); } public native long x(); public native longlong3 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong4.java index 4819476349d..1e3113ea4cb 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/longlong4.java @@ -26,7 +26,7 @@ public class longlong4 extends Pointer { return (longlong4)super.position(position); } @Override public longlong4 getPointer(long i) { - return new longlong4((Pointer)this).position(position + i); + return new longlong4((Pointer)this).offsetAddress(i); } public native long x(); public native longlong4 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short1.java index d6deaaf8431..851f3aeefb3 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short1.java @@ -26,7 +26,7 @@ public class short1 extends Pointer { return (short1)super.position(position); } @Override public short1 getPointer(long i) { - return new short1((Pointer)this).position(position + i); + return new short1((Pointer)this).offsetAddress(i); } public native short x(); public native short1 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short2.java index c7f1ccf03ee..1e2c989db1a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short2.java @@ -26,7 +26,7 @@ public class short2 extends Pointer { return (short2)super.position(position); } @Override public short2 getPointer(long i) { - return new short2((Pointer)this).position(position + i); + return new short2((Pointer)this).offsetAddress(i); } public native short x(); public native short2 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short3.java index a23cbc2f3b5..06818721755 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short3.java @@ -26,7 +26,7 @@ public class short3 extends Pointer { return (short3)super.position(position); } @Override public short3 getPointer(long i) { - return new short3((Pointer)this).position(position + i); + return new short3((Pointer)this).offsetAddress(i); } public native short x(); public native short3 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short4.java index 319f13ce4db..5530e8a190b 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/short4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/short4.java @@ -26,7 +26,7 @@ public class short4 extends Pointer { return (short4)super.position(position); } @Override public short4 getPointer(long i) { - return new short4((Pointer)this).position(position + i); + return new short4((Pointer)this).offsetAddress(i); } public native short x(); public native short4 x(short setter); public native short y(); public native short4 y(short setter); public native short z(); public native short4 z(short setter); public native short w(); public native short4 w(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/surfaceReference.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/surfaceReference.java index b0eb9969c92..104f8e3f7b3 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/surfaceReference.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/surfaceReference.java @@ -29,7 +29,7 @@ public class surfaceReference extends Pointer { return (surfaceReference)super.position(position); } @Override public surfaceReference getPointer(long i) { - return new surfaceReference((Pointer)this).position(position + i); + return new surfaceReference((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/textureReference.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/textureReference.java index 6d98fd36fe3..7c4f9360be8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/textureReference.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/textureReference.java @@ -29,7 +29,7 @@ public class textureReference extends Pointer { return (textureReference)super.position(position); } @Override public textureReference getPointer(long i) { - return new textureReference((Pointer)this).position(position + i); + return new textureReference((Pointer)this).offsetAddress(i); } /** diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar1.java index 9f450a800c6..c4fd98c9761 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar1.java @@ -26,7 +26,7 @@ public class uchar1 extends Pointer { return (uchar1)super.position(position); } @Override public uchar1 getPointer(long i) { - return new uchar1((Pointer)this).position(position + i); + return new uchar1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte x(); public native uchar1 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar2.java index d91e4736f1f..29e71332e16 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar2.java @@ -26,7 +26,7 @@ public class uchar2 extends Pointer { return (uchar2)super.position(position); } @Override public uchar2 getPointer(long i) { - return new uchar2((Pointer)this).position(position + i); + return new uchar2((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte x(); public native uchar2 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar3.java index ce22015f528..02ec407f669 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar3.java @@ -26,7 +26,7 @@ public class uchar3 extends Pointer { return (uchar3)super.position(position); } @Override public uchar3 getPointer(long i) { - return new uchar3((Pointer)this).position(position + i); + return new uchar3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte x(); public native uchar3 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar4.java index 72cff53473b..a9a9d54d3a8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uchar4.java @@ -26,7 +26,7 @@ public class uchar4 extends Pointer { return (uchar4)super.position(position); } @Override public uchar4 getPointer(long i) { - return new uchar4((Pointer)this).position(position + i); + return new uchar4((Pointer)this).offsetAddress(i); } public native @Cast("unsigned char") byte x(); public native uchar4 x(byte setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint1.java index 4ad5eab7f95..54cfbd74bbd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint1.java @@ -26,7 +26,7 @@ public class uint1 extends Pointer { return (uint1)super.position(position); } @Override public uint1 getPointer(long i) { - return new uint1((Pointer)this).position(position + i); + return new uint1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int x(); public native uint1 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint2.java index b5bb0e2959c..db4e8c3e3fe 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint2.java @@ -25,7 +25,7 @@ public class uint2 extends Pointer { return (uint2)super.position(position); } @Override public uint2 getPointer(long i) { - return new uint2((Pointer)this).position(position + i); + return new uint2((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int x(); public native uint2 x(int setter); public native @Cast("unsigned int") int y(); public native uint2 y(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint3.java index 6e75f492b99..7a1c172bf0e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint3.java @@ -26,7 +26,7 @@ public class uint3 extends Pointer { return (uint3)super.position(position); } @Override public uint3 getPointer(long i) { - return new uint3((Pointer)this).position(position + i); + return new uint3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int x(); public native uint3 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint4.java index 68ffee70cf1..8199df44087 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/uint4.java @@ -26,7 +26,7 @@ public class uint4 extends Pointer { return (uint4)super.position(position); } @Override public uint4 getPointer(long i) { - return new uint4((Pointer)this).position(position + i); + return new uint4((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int x(); public native uint4 x(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong1.java index 671ce8460c7..cd88cd3638a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong1.java @@ -26,7 +26,7 @@ public class ulong1 extends Pointer { return (ulong1)super.position(position); } @Override public ulong1 getPointer(long i) { - return new ulong1((Pointer)this).position(position + i); + return new ulong1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long") long x(); public native ulong1 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong2.java index c2f0932896c..1c1cd5ca60f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong2.java @@ -25,7 +25,7 @@ public class ulong2 extends Pointer { return (ulong2)super.position(position); } @Override public ulong2 getPointer(long i) { - return new ulong2((Pointer)this).position(position + i); + return new ulong2((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long int") long x(); public native ulong2 x(long setter); public native @Cast("unsigned long int") long y(); public native ulong2 y(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong3.java index f4882d38bfd..053b76973f5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong3.java @@ -26,7 +26,7 @@ public class ulong3 extends Pointer { return (ulong3)super.position(position); } @Override public ulong3 getPointer(long i) { - return new ulong3((Pointer)this).position(position + i); + return new ulong3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long int") long x(); public native ulong3 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong4.java index 4ab87372d68..996e8060a08 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulong4.java @@ -26,7 +26,7 @@ public class ulong4 extends Pointer { return (ulong4)super.position(position); } @Override public ulong4 getPointer(long i) { - return new ulong4((Pointer)this).position(position + i); + return new ulong4((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long int") long x(); public native ulong4 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong1.java index c55f2b85fe6..37a3375ccc9 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong1.java @@ -26,7 +26,7 @@ public class ulonglong1 extends Pointer { return (ulonglong1)super.position(position); } @Override public ulonglong1 getPointer(long i) { - return new ulonglong1((Pointer)this).position(position + i); + return new ulonglong1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long long int") long x(); public native ulonglong1 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong2.java index 174fdb98ba2..c4d67dec446 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong2.java @@ -26,7 +26,7 @@ public class ulonglong2 extends Pointer { return (ulonglong2)super.position(position); } @Override public ulonglong2 getPointer(long i) { - return new ulonglong2((Pointer)this).position(position + i); + return new ulonglong2((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long long int") long x(); public native ulonglong2 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong3.java index 8a351a9d40a..3a978726e66 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong3.java @@ -26,7 +26,7 @@ public class ulonglong3 extends Pointer { return (ulonglong3)super.position(position); } @Override public ulonglong3 getPointer(long i) { - return new ulonglong3((Pointer)this).position(position + i); + return new ulonglong3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long long int") long x(); public native ulonglong3 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong4.java index 35ef158e8ce..f15c3067176 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ulonglong4.java @@ -26,7 +26,7 @@ public class ulonglong4 extends Pointer { return (ulonglong4)super.position(position); } @Override public ulonglong4 getPointer(long i) { - return new ulonglong4((Pointer)this).position(position + i); + return new ulonglong4((Pointer)this).offsetAddress(i); } public native @Cast("unsigned long long int") long x(); public native ulonglong4 x(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort1.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort1.java index 956eb5a9b4a..a4fb11cd1de 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort1.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort1.java @@ -26,7 +26,7 @@ public class ushort1 extends Pointer { return (ushort1)super.position(position); } @Override public ushort1 getPointer(long i) { - return new ushort1((Pointer)this).position(position + i); + return new ushort1((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native ushort1 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort2.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort2.java index 0f3d292851f..f204f9fdf91 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort2.java @@ -26,7 +26,7 @@ public class ushort2 extends Pointer { return (ushort2)super.position(position); } @Override public ushort2 getPointer(long i) { - return new ushort2((Pointer)this).position(position + i); + return new ushort2((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native ushort2 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort3.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort3.java index 11f70e84ec4..9bb136a9ffd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort3.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort3.java @@ -26,7 +26,7 @@ public class ushort3 extends Pointer { return (ushort3)super.position(position); } @Override public ushort3 getPointer(long i) { - return new ushort3((Pointer)this).position(position + i); + return new ushort3((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native ushort3 x(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort4.java b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort4.java index 41eb28cb060..b65fa00adc2 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort4.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudart/ushort4.java @@ -25,7 +25,7 @@ public class ushort4 extends Pointer { return (ushort4)super.position(position); } @Override public ushort4 getPointer(long i) { - return new ushort4((Pointer)this).position(position + i); + return new ushort4((Pointer)this).offsetAddress(i); } public native @Cast("unsigned short") short x(); public native ushort4 x(short setter); public native @Cast("unsigned short") short y(); public native ushort4 y(short setter); public native @Cast("unsigned short") short z(); public native ushort4 z(short setter); public native @Cast("unsigned short") short w(); public native ushort4 w(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnAlgorithm_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnAlgorithm_t.java index 06cef24f20c..3747d02104c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnAlgorithm_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnAlgorithm_t.java @@ -29,7 +29,7 @@ public class cudnnAlgorithm_t extends Pointer { return (cudnnAlgorithm_t)super.position(position); } @Override public cudnnAlgorithm_t getPointer(long i) { - return new cudnnAlgorithm_t((Pointer)this).position(position + i); + return new cudnnAlgorithm_t((Pointer)this).offsetAddress(i); } @Name("algo.convFwdAlgo") public native @Cast("cudnnConvolutionFwdAlgo_t") int algo_convFwdAlgo(); public native cudnnAlgorithm_t algo_convFwdAlgo(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdDataAlgoPerf_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdDataAlgoPerf_t.java index 6f56805e3ec..51a6334b7f6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdDataAlgoPerf_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdDataAlgoPerf_t.java @@ -30,7 +30,7 @@ public class cudnnConvolutionBwdDataAlgoPerf_t extends Pointer { return (cudnnConvolutionBwdDataAlgoPerf_t)super.position(position); } @Override public cudnnConvolutionBwdDataAlgoPerf_t getPointer(long i) { - return new cudnnConvolutionBwdDataAlgoPerf_t((Pointer)this).position(position + i); + return new cudnnConvolutionBwdDataAlgoPerf_t((Pointer)this).offsetAddress(i); } public native @Cast("cudnnConvolutionBwdDataAlgo_t") int algo(); public native cudnnConvolutionBwdDataAlgoPerf_t algo(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdFilterAlgoPerf_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdFilterAlgoPerf_t.java index 723458a9dd9..5c8e52a83b7 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdFilterAlgoPerf_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionBwdFilterAlgoPerf_t.java @@ -31,7 +31,7 @@ public class cudnnConvolutionBwdFilterAlgoPerf_t extends Pointer { return (cudnnConvolutionBwdFilterAlgoPerf_t)super.position(position); } @Override public cudnnConvolutionBwdFilterAlgoPerf_t getPointer(long i) { - return new cudnnConvolutionBwdFilterAlgoPerf_t((Pointer)this).position(position + i); + return new cudnnConvolutionBwdFilterAlgoPerf_t((Pointer)this).offsetAddress(i); } public native @Cast("cudnnConvolutionBwdFilterAlgo_t") int algo(); public native cudnnConvolutionBwdFilterAlgoPerf_t algo(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionFwdAlgoPerf_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionFwdAlgoPerf_t.java index 782202a9e49..94e7d326464 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionFwdAlgoPerf_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnConvolutionFwdAlgoPerf_t.java @@ -28,7 +28,7 @@ public class cudnnConvolutionFwdAlgoPerf_t extends Pointer { return (cudnnConvolutionFwdAlgoPerf_t)super.position(position); } @Override public cudnnConvolutionFwdAlgoPerf_t getPointer(long i) { - return new cudnnConvolutionFwdAlgoPerf_t((Pointer)this).position(position + i); + return new cudnnConvolutionFwdAlgoPerf_t((Pointer)this).offsetAddress(i); } public native @Cast("cudnnConvolutionFwdAlgo_t") int algo(); public native cudnnConvolutionFwdAlgoPerf_t algo(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnDebug_t.java b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnDebug_t.java index 961895db434..69faf0af8c0 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnDebug_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cudnn/cudnnDebug_t.java @@ -29,7 +29,7 @@ public class cudnnDebug_t extends Pointer { return (cudnnDebug_t)super.position(position); } @Override public cudnnDebug_t getPointer(long i) { - return new cudnnDebug_t((Pointer)this).position(position + i); + return new cudnnDebug_t((Pointer)this).offsetAddress(i); } public native @Cast("unsigned") int cudnn_version(); public native cudnnDebug_t cudnn_version(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim.java b/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim.java index 6809d866167..70d2627080e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim.java @@ -29,7 +29,7 @@ public class fftw_iodim extends Pointer { return (fftw_iodim)super.position(position); } @Override public fftw_iodim getPointer(long i) { - return new fftw_iodim((Pointer)this).position(position + i); + return new fftw_iodim((Pointer)this).offsetAddress(i); } public native int n(); public native fftw_iodim n(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim64.java b/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim64.java index 7fdf98c1624..d1746cd2213 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim64.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/cufftw/fftw_iodim64.java @@ -29,7 +29,7 @@ public class fftw_iodim64 extends Pointer { return (fftw_iodim64)super.position(position); } @Override public fftw_iodim64 getPointer(long i) { - return new fftw_iodim64((Pointer)this).position(position + i); + return new fftw_iodim64((Pointer)this).offsetAddress(i); } public native @Cast("ptrdiff_t") long n(); public native fftw_iodim64 n(long setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java index ff9772e328d..b6b55b359a8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java @@ -154,8 +154,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { // #define CUDNN_VERSION_H_ public static final int CUDNN_MAJOR = 8; -public static final int CUDNN_MINOR = 1; -public static final int CUDNN_PATCHLEVEL = 1; +public static final int CUDNN_MINOR = 2; +public static final int CUDNN_PATCHLEVEL = 0; public static final int CUDNN_VERSION = (CUDNN_MAJOR * 1000 + CUDNN_MINOR * 100 + CUDNN_PATCHLEVEL); @@ -227,8 +227,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_OPS_INFER_MAJOR = 8; -public static final int CUDNN_OPS_INFER_MINOR = 1; -public static final int CUDNN_OPS_INFER_PATCH = 1; +public static final int CUDNN_OPS_INFER_MINOR = 2; +public static final int CUDNN_OPS_INFER_PATCH = 0; // #if (CUDNN_OPS_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_OPS_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_OPS_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -1043,7 +1043,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { CUDNN_ACTIVATION_TANH = 2, CUDNN_ACTIVATION_CLIPPED_RELU = 3, CUDNN_ACTIVATION_ELU = 4, - CUDNN_ACTIVATION_IDENTITY = 5; + CUDNN_ACTIVATION_IDENTITY = 5, + CUDNN_ACTIVATION_SWISH = 6; /* Activation functions: All of the form "output = alpha * Op(inputs) + beta * output" */ public static native @Cast("cudnnStatus_t") int cudnnCreateActivationDescriptor(@ByPtrPtr cudnnActivationStruct activationDesc); @@ -1066,6 +1067,12 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { @Cast("cudnnNanPropagation_t*") int[] reluNanOpt, double[] coef); /* ceiling for clipped RELU, alpha for ELU */ +public static native @Cast("cudnnStatus_t") int cudnnSetActivationDescriptorSwishBeta(cudnnActivationStruct activationDesc, double swish_beta); + +public static native @Cast("cudnnStatus_t") int cudnnGetActivationDescriptorSwishBeta(cudnnActivationStruct activationDesc, DoublePointer swish_beta); +public static native @Cast("cudnnStatus_t") int cudnnGetActivationDescriptorSwishBeta(cudnnActivationStruct activationDesc, DoubleBuffer swish_beta); +public static native @Cast("cudnnStatus_t") int cudnnGetActivationDescriptorSwishBeta(cudnnActivationStruct activationDesc, double[] swish_beta); + public static native @Cast("cudnnStatus_t") int cudnnDestroyActivationDescriptor(cudnnActivationStruct activationDesc); /* Function to perform forward activation */ @@ -1558,8 +1565,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_OPS_TRAIN_MAJOR = 8; -public static final int CUDNN_OPS_TRAIN_MINOR = 1; -public static final int CUDNN_OPS_TRAIN_PATCH = 1; +public static final int CUDNN_OPS_TRAIN_MINOR = 2; +public static final int CUDNN_OPS_TRAIN_PATCH = 0; // #if (CUDNN_OPS_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_OPS_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_OPS_TRAIN_PATCH != CUDNN_PATCHLEVEL) @@ -1989,8 +1996,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_ADV_INFER_MAJOR = 8; -public static final int CUDNN_ADV_INFER_MINOR = 1; -public static final int CUDNN_ADV_INFER_PATCH = 1; +public static final int CUDNN_ADV_INFER_MINOR = 2; +public static final int CUDNN_ADV_INFER_PATCH = 0; // #if (CUDNN_ADV_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_ADV_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_ADV_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -3058,8 +3065,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_ADV_TRAIN_MAJOR = 8; -public static final int CUDNN_ADV_TRAIN_MINOR = 1; -public static final int CUDNN_ADV_TRAIN_PATCH = 1; +public static final int CUDNN_ADV_TRAIN_MINOR = 2; +public static final int CUDNN_ADV_TRAIN_PATCH = 0; // #if (CUDNN_ADV_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_ADV_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_ADV_TRAIN_PATCH != CUDNN_PATCHLEVEL) @@ -4222,8 +4229,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_CNN_INFER_MAJOR = 8; -public static final int CUDNN_CNN_INFER_MINOR = 1; -public static final int CUDNN_CNN_INFER_PATCH = 1; +public static final int CUDNN_CNN_INFER_MINOR = 2; +public static final int CUDNN_CNN_INFER_PATCH = 0; // #if (CUDNN_CNN_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_CNN_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_CNN_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -4945,8 +4952,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_CNN_TRAIN_MAJOR = 8; -public static final int CUDNN_CNN_TRAIN_MINOR = 1; -public static final int CUDNN_CNN_TRAIN_PATCH = 1; +public static final int CUDNN_CNN_TRAIN_MINOR = 2; +public static final int CUDNN_CNN_TRAIN_PATCH = 0; // #if (CUDNN_CNN_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_CNN_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_CNN_TRAIN_PATCH != CUDNN_PATCHLEVEL) diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nccl/ncclUniqueId.java b/cuda/src/gen/java/org/bytedeco/cuda/nccl/ncclUniqueId.java index 74ee1da1056..af14668ef8b 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nccl/ncclUniqueId.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nccl/ncclUniqueId.java @@ -27,7 +27,7 @@ public class ncclUniqueId extends Pointer { return (ncclUniqueId)super.position(position); } @Override public ncclUniqueId getPointer(long i) { - return new ncclUniqueId((Pointer)this).position(position + i); + return new ncclUniqueId((Pointer)this).offsetAddress(i); } public native @Cast("char") byte internal(int i); public native ncclUniqueId internal(int i, byte setter); @MemberGetter public native @Cast("char*") BytePointer internal(); } diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f.java index e91f02e591e..97b023c1b18 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f.java @@ -30,7 +30,7 @@ public class Npp16f extends Pointer { return (Npp16f)super.position(position); } @Override public Npp16f getPointer(long i) { - return new Npp16f((Pointer)this).position(position + i); + return new Npp16f((Pointer)this).offsetAddress(i); } public native short fp16(); public native Npp16f fp16(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f_2.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f_2.java index f306657bc43..9979cb7d589 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f_2.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16f_2.java @@ -28,7 +28,7 @@ public class Npp16f_2 extends Pointer { return (Npp16f_2)super.position(position); } @Override public Npp16f_2 getPointer(long i) { - return new Npp16f_2((Pointer)this).position(position + i); + return new Npp16f_2((Pointer)this).offsetAddress(i); } public native short fp16_0(); public native Npp16f_2 fp16_0(short setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16sc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16sc.java index 621fbf0b731..38f266e8bd8 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16sc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16sc.java @@ -32,7 +32,7 @@ public class Npp16sc extends Pointer { return (Npp16sc)super.position(position); } @Override public Npp16sc getPointer(long i) { - return new Npp16sc((Pointer)this).position(position + i); + return new Npp16sc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16uc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16uc.java index 55523db205f..14057d9623c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16uc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp16uc.java @@ -32,7 +32,7 @@ public class Npp16uc extends Pointer { return (Npp16uc)super.position(position); } @Override public Npp16uc getPointer(long i) { - return new Npp16uc((Pointer)this).position(position + i); + return new Npp16uc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32fc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32fc.java index 4c956d12d23..4b3c793fc8f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32fc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32fc.java @@ -32,7 +32,7 @@ public class Npp32fc extends Pointer { return (Npp32fc)super.position(position); } @Override public Npp32fc getPointer(long i) { - return new Npp32fc((Pointer)this).position(position + i); + return new Npp32fc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32sc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32sc.java index ec1f4126dd0..bcb85ae5002 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32sc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32sc.java @@ -32,7 +32,7 @@ public class Npp32sc extends Pointer { return (Npp32sc)super.position(position); } @Override public Npp32sc getPointer(long i) { - return new Npp32sc((Pointer)this).position(position + i); + return new Npp32sc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32uc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32uc.java index 9fd0b49fceb..ee58ff9ef47 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32uc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp32uc.java @@ -32,7 +32,7 @@ public class Npp32uc extends Pointer { return (Npp32uc)super.position(position); } @Override public Npp32uc getPointer(long i) { - return new Npp32uc((Pointer)this).position(position + i); + return new Npp32uc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64fc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64fc.java index bdf2de0743e..b58ad2cc59e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64fc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64fc.java @@ -32,7 +32,7 @@ public class Npp64fc extends Pointer { return (Npp64fc)super.position(position); } @Override public Npp64fc getPointer(long i) { - return new Npp64fc((Pointer)this).position(position + i); + return new Npp64fc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64sc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64sc.java index 5c8609f8d2a..f317e4d3842 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64sc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp64sc.java @@ -32,7 +32,7 @@ public class Npp64sc extends Pointer { return (Npp64sc)super.position(position); } @Override public Npp64sc getPointer(long i) { - return new Npp64sc((Pointer)this).position(position + i); + return new Npp64sc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp8uc.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp8uc.java index a337f1e7df8..78dcdb16a8c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp8uc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/Npp8uc.java @@ -33,7 +33,7 @@ public class Npp8uc extends Pointer { return (Npp8uc)super.position(position); } @Override public Npp8uc getPointer(long i) { - return new Npp8uc((Pointer)this).position(position + i); + return new Npp8uc((Pointer)this).offsetAddress(i); } /** Real part */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppLibraryVersion.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppLibraryVersion.java index 4c119719bee..f404c11ec10 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppLibraryVersion.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppLibraryVersion.java @@ -28,7 +28,7 @@ public class NppLibraryVersion extends Pointer { return (NppLibraryVersion)super.position(position); } @Override public NppLibraryVersion getPointer(long i) { - return new NppLibraryVersion((Pointer)this).position(position + i); + return new NppLibraryVersion((Pointer)this).offsetAddress(i); } /** Major version number */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppPointPolar.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppPointPolar.java index 1cacd089800..a0d7a209c3c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppPointPolar.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppPointPolar.java @@ -31,7 +31,7 @@ public class NppPointPolar extends Pointer { return (NppPointPolar)super.position(position); } @Override public NppPointPolar getPointer(long i) { - return new NppPointPolar((Pointer)this).position(position + i); + return new NppPointPolar((Pointer)this).offsetAddress(i); } public native @Cast("Npp32f") float rho(); public native NppPointPolar rho(float setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppStreamContext.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppStreamContext.java index 7c59795d0cf..5b68e04028d 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppStreamContext.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppStreamContext.java @@ -34,7 +34,7 @@ public class NppStreamContext extends Pointer { return (NppStreamContext)super.position(position); } @Override public NppStreamContext getPointer(long i) { - return new NppStreamContext((Pointer)this).position(position + i); + return new NppStreamContext((Pointer)this).offsetAddress(i); } public native CUstream_st hStream(); public native NppStreamContext hStream(CUstream_st setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiBufferDescriptor.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiBufferDescriptor.java index f89bc1500f9..383360debe9 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiBufferDescriptor.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiBufferDescriptor.java @@ -29,7 +29,7 @@ public class NppiBufferDescriptor extends Pointer { return (NppiBufferDescriptor)super.position(position); } @Override public NppiBufferDescriptor getPointer(long i) { - return new NppiBufferDescriptor((Pointer)this).position(position + i); + return new NppiBufferDescriptor((Pointer)this).offsetAddress(i); } /** per image device memory pointer to the corresponding buffer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiCompressedMarkerLabelsInfo.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiCompressedMarkerLabelsInfo.java index 6dc5ae4654f..d03aa711cdb 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiCompressedMarkerLabelsInfo.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiCompressedMarkerLabelsInfo.java @@ -34,7 +34,7 @@ public class NppiCompressedMarkerLabelsInfo extends Pointer { return (NppiCompressedMarkerLabelsInfo)super.position(position); } @Override public NppiCompressedMarkerLabelsInfo getPointer(long i) { - return new NppiCompressedMarkerLabelsInfo((Pointer)this).position(position + i); + return new NppiCompressedMarkerLabelsInfo((Pointer)this).offsetAddress(i); } /** total number of pixels in this connected pixel region */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiConnectedRegion.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiConnectedRegion.java index a0d9cb49231..781295781e4 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiConnectedRegion.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiConnectedRegion.java @@ -28,7 +28,7 @@ public class NppiConnectedRegion extends Pointer { return (NppiConnectedRegion)super.position(position); } @Override public NppiConnectedRegion getPointer(long i) { - return new NppiConnectedRegion((Pointer)this).position(position + i); + return new NppiConnectedRegion((Pointer)this).offsetAddress(i); } /** x, y, width, height == left, top, right, and bottom pixel coordinates */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelDirectionInfo.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelDirectionInfo.java index 2ac9e0731fb..52f52df5472 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelDirectionInfo.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelDirectionInfo.java @@ -28,7 +28,7 @@ public class NppiContourPixelDirectionInfo extends Pointer { return (NppiContourPixelDirectionInfo)super.position(position); } @Override public NppiContourPixelDirectionInfo getPointer(long i) { - return new NppiContourPixelDirectionInfo((Pointer)this).position(position + i); + return new NppiContourPixelDirectionInfo((Pointer)this).offsetAddress(i); } /** provides current contour pixel input and output direction info */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelGeometryInfo.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelGeometryInfo.java index e0b5b0f0b0f..8ca47c32340 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelGeometryInfo.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourPixelGeometryInfo.java @@ -34,7 +34,7 @@ public class NppiContourPixelGeometryInfo extends Pointer { return (NppiContourPixelGeometryInfo)super.position(position); } @Override public NppiContourPixelGeometryInfo getPointer(long i) { - return new NppiContourPixelGeometryInfo((Pointer)this).position(position + i); + return new NppiContourPixelGeometryInfo((Pointer)this).offsetAddress(i); } /** image geometry X and Y location of current contour pixel */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourTotalsInfo.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourTotalsInfo.java index a22b7d46257..460663e020f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourTotalsInfo.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiContourTotalsInfo.java @@ -28,7 +28,7 @@ public class NppiContourTotalsInfo extends Pointer { return (NppiContourTotalsInfo)super.position(position); } @Override public NppiContourTotalsInfo getPointer(long i) { - return new NppiContourTotalsInfo((Pointer)this).position(position + i); + return new NppiContourTotalsInfo((Pointer)this).offsetAddress(i); } /** total number of contour pixels in image */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHOGConfig.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHOGConfig.java index 295ff0171d7..fbefa75baad 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHOGConfig.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHOGConfig.java @@ -33,7 +33,7 @@ public class NppiHOGConfig extends Pointer { return (NppiHOGConfig)super.position(position); } @Override public NppiHOGConfig getPointer(long i) { - return new NppiHOGConfig((Pointer)this).position(position + i); + return new NppiHOGConfig((Pointer)this).offsetAddress(i); } /** square cell size (pixels). */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarBuffer.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarBuffer.java index 635d85b99a2..c0c072cef92 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarBuffer.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarBuffer.java @@ -28,7 +28,7 @@ public class NppiHaarBuffer extends Pointer { return (NppiHaarBuffer)super.position(position); } @Override public NppiHaarBuffer getPointer(long i) { - return new NppiHaarBuffer((Pointer)this).position(position + i); + return new NppiHaarBuffer((Pointer)this).offsetAddress(i); } /** size of the buffer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarClassifier_32f.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarClassifier_32f.java index 153ce15eff9..c98cc35598a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarClassifier_32f.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiHaarClassifier_32f.java @@ -28,7 +28,7 @@ public class NppiHaarClassifier_32f extends Pointer { return (NppiHaarClassifier_32f)super.position(position); } @Override public NppiHaarClassifier_32f getPointer(long i) { - return new NppiHaarClassifier_32f((Pointer)this).position(position + i); + return new NppiHaarClassifier_32f((Pointer)this).offsetAddress(i); } /** number of classifiers */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiImageDescriptor.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiImageDescriptor.java index 1de4486168a..e8927584a9e 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiImageDescriptor.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiImageDescriptor.java @@ -33,7 +33,7 @@ public class NppiImageDescriptor extends Pointer { return (NppiImageDescriptor)super.position(position); } @Override public NppiImageDescriptor getPointer(long i) { - return new NppiImageDescriptor((Pointer)this).position(position + i); + return new NppiImageDescriptor((Pointer)this).offsetAddress(i); } /** device memory pointer to the image */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiPoint.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiPoint.java index 6a1127857d4..f36380a7626 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiPoint.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiPoint.java @@ -32,7 +32,7 @@ public class NppiPoint extends Pointer { return (NppiPoint)super.position(position); } @Override public NppiPoint getPointer(long i) { - return new NppiPoint((Pointer)this).position(position + i); + return new NppiPoint((Pointer)this).offsetAddress(i); } /** x-coordinate. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiRect.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiRect.java index fa0c4d6bad7..7b62f033624 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiRect.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiRect.java @@ -35,7 +35,7 @@ public class NppiRect extends Pointer { return (NppiRect)super.position(position); } @Override public NppiRect getPointer(long i) { - return new NppiRect((Pointer)this).position(position + i); + return new NppiRect((Pointer)this).offsetAddress(i); } /** x-coordinate of upper left corner (lowest memory address). */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiSize.java b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiSize.java index 8552330fb6f..fb5f4d8fdd9 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiSize.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppc/NppiSize.java @@ -33,7 +33,7 @@ public class NppiSize extends Pointer { return (NppiSize)super.position(position); } @Override public NppiSize getPointer(long i) { - return new NppiSize((Pointer)this).position(position + i); + return new NppiSize((Pointer)this).offsetAddress(i); } /** Rectangle width. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppicc/NppiColorTwistBatchCXR.java b/cuda/src/gen/java/org/bytedeco/cuda/nppicc/NppiColorTwistBatchCXR.java index 2f19cd45b49..2ef3de9c729 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppicc/NppiColorTwistBatchCXR.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppicc/NppiColorTwistBatchCXR.java @@ -66,7 +66,7 @@ public class NppiColorTwistBatchCXR extends Pointer { return (NppiColorTwistBatchCXR)super.position(position); } @Override public NppiColorTwistBatchCXR getPointer(long i) { - return new NppiColorTwistBatchCXR((Pointer)this).position(position + i); + return new NppiColorTwistBatchCXR((Pointer)this).offsetAddress(i); } public native @Const Pointer pSrc(); public native NppiColorTwistBatchCXR pSrc(Pointer setter); /* device memory pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiMirrorBatchCXR.java b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiMirrorBatchCXR.java index 96150ef01fb..51143ede7ab 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiMirrorBatchCXR.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiMirrorBatchCXR.java @@ -56,7 +56,7 @@ public class NppiMirrorBatchCXR extends Pointer { return (NppiMirrorBatchCXR)super.position(position); } @Override public NppiMirrorBatchCXR getPointer(long i) { - return new NppiMirrorBatchCXR((Pointer)this).position(position + i); + return new NppiMirrorBatchCXR((Pointer)this).offsetAddress(i); } public native @Const Pointer pSrc(); public native NppiMirrorBatchCXR pSrc(Pointer setter); /* device memory pointer, ignored for in place versions */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchCXR.java b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchCXR.java index f50285cbb30..cf974c65e0a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchCXR.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchCXR.java @@ -108,7 +108,7 @@ public class NppiResizeBatchCXR extends Pointer { return (NppiResizeBatchCXR)super.position(position); } @Override public NppiResizeBatchCXR getPointer(long i) { - return new NppiResizeBatchCXR((Pointer)this).position(position + i); + return new NppiResizeBatchCXR((Pointer)this).offsetAddress(i); } public native @Const Pointer pSrc(); public native NppiResizeBatchCXR pSrc(Pointer setter); /* device memory pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchROI_Advanced.java b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchROI_Advanced.java index 1825cae0cb3..885cff7efd0 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchROI_Advanced.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiResizeBatchROI_Advanced.java @@ -34,7 +34,7 @@ public class NppiResizeBatchROI_Advanced extends Pointer { return (NppiResizeBatchROI_Advanced)super.position(position); } @Override public NppiResizeBatchROI_Advanced getPointer(long i) { - return new NppiResizeBatchROI_Advanced((Pointer)this).position(position + i); + return new NppiResizeBatchROI_Advanced((Pointer)this).offsetAddress(i); } public native @ByRef NppiRect oSrcRectROI(); public native NppiResizeBatchROI_Advanced oSrcRectROI(NppiRect setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpAffineBatchCXR.java b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpAffineBatchCXR.java index 5334ce4f510..a53ac50a332 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpAffineBatchCXR.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpAffineBatchCXR.java @@ -84,7 +84,7 @@ public class NppiWarpAffineBatchCXR extends Pointer { return (NppiWarpAffineBatchCXR)super.position(position); } @Override public NppiWarpAffineBatchCXR getPointer(long i) { - return new NppiWarpAffineBatchCXR((Pointer)this).position(position + i); + return new NppiWarpAffineBatchCXR((Pointer)this).offsetAddress(i); } public native @Const Pointer pSrc(); public native NppiWarpAffineBatchCXR pSrc(Pointer setter); /* device memory pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpPerspectiveBatchCXR.java b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpPerspectiveBatchCXR.java index 34e12502918..914c7ab2c10 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpPerspectiveBatchCXR.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nppig/NppiWarpPerspectiveBatchCXR.java @@ -83,7 +83,7 @@ public class NppiWarpPerspectiveBatchCXR extends Pointer { return (NppiWarpPerspectiveBatchCXR)super.position(position); } @Override public NppiWarpPerspectiveBatchCXR getPointer(long i) { - return new NppiWarpPerspectiveBatchCXR((Pointer)this).position(position + i); + return new NppiWarpPerspectiveBatchCXR((Pointer)this).offsetAddress(i); } public native @Const Pointer pSrc(); public native NppiWarpPerspectiveBatchCXR pSrc(Pointer setter); /* device memory pointer */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlAccountingStats_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlAccountingStats_t.java index 311e297c240..e52307fda0c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlAccountingStats_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlAccountingStats_t.java @@ -46,7 +46,7 @@ public class nvmlAccountingStats_t extends Pointer { return (nvmlAccountingStats_t)super.position(position); } @Override public nvmlAccountingStats_t getPointer(long i) { - return new nvmlAccountingStats_t((Pointer)this).position(position + i); + return new nvmlAccountingStats_t((Pointer)this).offsetAddress(i); } /** Percent of time over the process's lifetime during which one or more kernels was executing on the GPU. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBAR1Memory_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBAR1Memory_t.java index 31a1f495f5d..0cddfca48b1 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBAR1Memory_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBAR1Memory_t.java @@ -31,7 +31,7 @@ public class nvmlBAR1Memory_t extends Pointer { return (nvmlBAR1Memory_t)super.position(position); } @Override public nvmlBAR1Memory_t getPointer(long i) { - return new nvmlBAR1Memory_t((Pointer)this).position(position + i); + return new nvmlBAR1Memory_t((Pointer)this).offsetAddress(i); } /** Total BAR1 Memory (in bytes) */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipHierarchy_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipHierarchy_t.java index d9a25a711a1..90579366aee 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipHierarchy_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipHierarchy_t.java @@ -32,7 +32,7 @@ public class nvmlBridgeChipHierarchy_t extends Pointer { return (nvmlBridgeChipHierarchy_t)super.position(position); } @Override public nvmlBridgeChipHierarchy_t getPointer(long i) { - return new nvmlBridgeChipHierarchy_t((Pointer)this).position(position + i); + return new nvmlBridgeChipHierarchy_t((Pointer)this).offsetAddress(i); } /** Number of Bridge Chips on the Board */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipInfo_t.java index 2d3031f444a..b2e55e99d0a 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlBridgeChipInfo_t.java @@ -31,7 +31,7 @@ public class nvmlBridgeChipInfo_t extends Pointer { return (nvmlBridgeChipInfo_t)super.position(position); } @Override public nvmlBridgeChipInfo_t getPointer(long i) { - return new nvmlBridgeChipInfo_t((Pointer)this).position(position + i); + return new nvmlBridgeChipInfo_t((Pointer)this).offsetAddress(i); } /** Type of Bridge Chip */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceInfo_t.java index afecaa52782..6b3f109e067 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceInfo_t.java @@ -28,7 +28,7 @@ public class nvmlComputeInstanceInfo_t extends Pointer { return (nvmlComputeInstanceInfo_t)super.position(position); } @Override public nvmlComputeInstanceInfo_t getPointer(long i) { - return new nvmlComputeInstanceInfo_t((Pointer)this).position(position + i); + return new nvmlComputeInstanceInfo_t((Pointer)this).offsetAddress(i); } /** Parent device */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstancePlacement_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstancePlacement_t.java index eed1cc1cdf5..55f90ef7b64 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstancePlacement_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstancePlacement_t.java @@ -28,7 +28,7 @@ public class nvmlComputeInstancePlacement_t extends Pointer { return (nvmlComputeInstancePlacement_t)super.position(position); } @Override public nvmlComputeInstancePlacement_t getPointer(long i) { - return new nvmlComputeInstancePlacement_t((Pointer)this).position(position + i); + return new nvmlComputeInstancePlacement_t((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int start(); public native nvmlComputeInstancePlacement_t start(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceProfileInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceProfileInfo_t.java index 20ef1d88abc..feff49a59e4 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceProfileInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlComputeInstanceProfileInfo_t.java @@ -28,7 +28,7 @@ public class nvmlComputeInstanceProfileInfo_t extends Pointer { return (nvmlComputeInstanceProfileInfo_t)super.position(position); } @Override public nvmlComputeInstanceProfileInfo_t getPointer(long i) { - return new nvmlComputeInstanceProfileInfo_t((Pointer)this).position(position + i); + return new nvmlComputeInstanceProfileInfo_t((Pointer)this).offsetAddress(i); } /** Unique profile ID within the GPU instance */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlDeviceAttributes_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlDeviceAttributes_t.java index 262ce5f0d54..e0595adc401 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlDeviceAttributes_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlDeviceAttributes_t.java @@ -28,7 +28,7 @@ public class nvmlDeviceAttributes_t extends Pointer { return (nvmlDeviceAttributes_t)super.position(position); } @Override public nvmlDeviceAttributes_t getPointer(long i) { - return new nvmlDeviceAttributes_t((Pointer)this).position(position + i); + return new nvmlDeviceAttributes_t((Pointer)this).offsetAddress(i); } /** Streaming Multiprocessor count */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEccErrorCounts_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEccErrorCounts_t.java index 7e3065fc8e8..191b645b990 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEccErrorCounts_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEccErrorCounts_t.java @@ -34,7 +34,7 @@ public class nvmlEccErrorCounts_t extends Pointer { return (nvmlEccErrorCounts_t)super.position(position); } @Override public nvmlEccErrorCounts_t getPointer(long i) { - return new nvmlEccErrorCounts_t((Pointer)this).position(position + i); + return new nvmlEccErrorCounts_t((Pointer)this).offsetAddress(i); } /** L1 cache errors */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEncoderSessionInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEncoderSessionInfo_t.java index c2753149094..ff96a907018 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEncoderSessionInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEncoderSessionInfo_t.java @@ -31,7 +31,7 @@ public class nvmlEncoderSessionInfo_t extends Pointer { return (nvmlEncoderSessionInfo_t)super.position(position); } @Override public nvmlEncoderSessionInfo_t getPointer(long i) { - return new nvmlEncoderSessionInfo_t((Pointer)this).position(position + i); + return new nvmlEncoderSessionInfo_t((Pointer)this).offsetAddress(i); } /** Unique session ID */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEventData_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEventData_t.java index a4ff1a67b7a..66d206c5ac5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEventData_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlEventData_t.java @@ -32,7 +32,7 @@ public class nvmlEventData_t extends Pointer { return (nvmlEventData_t)super.position(position); } @Override public nvmlEventData_t getPointer(long i) { - return new nvmlEventData_t((Pointer)this).position(position + i); + return new nvmlEventData_t((Pointer)this).offsetAddress(i); } /** Specific device where the event occurred */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlExcludedDeviceInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlExcludedDeviceInfo_t.java index 12850796d19..b0ff77ad772 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlExcludedDeviceInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlExcludedDeviceInfo_t.java @@ -39,7 +39,7 @@ public class nvmlExcludedDeviceInfo_t extends Pointer { return (nvmlExcludedDeviceInfo_t)super.position(position); } @Override public nvmlExcludedDeviceInfo_t getPointer(long i) { - return new nvmlExcludedDeviceInfo_t((Pointer)this).position(position + i); + return new nvmlExcludedDeviceInfo_t((Pointer)this).offsetAddress(i); } /** The PCI information for the excluded GPU */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCSessionInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCSessionInfo_t.java index a2efd031795..6305442699f 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCSessionInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCSessionInfo_t.java @@ -31,7 +31,7 @@ public class nvmlFBCSessionInfo_t extends Pointer { return (nvmlFBCSessionInfo_t)super.position(position); } @Override public nvmlFBCSessionInfo_t getPointer(long i) { - return new nvmlFBCSessionInfo_t((Pointer)this).position(position + i); + return new nvmlFBCSessionInfo_t((Pointer)this).offsetAddress(i); } /** Unique session ID */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCStats_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCStats_t.java index dd533ce37f2..4fe1d470393 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCStats_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFBCStats_t.java @@ -31,7 +31,7 @@ public class nvmlFBCStats_t extends Pointer { return (nvmlFBCStats_t)super.position(position); } @Override public nvmlFBCStats_t getPointer(long i) { - return new nvmlFBCStats_t((Pointer)this).position(position + i); + return new nvmlFBCStats_t((Pointer)this).offsetAddress(i); } /** Total no of sessions */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFieldValue_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFieldValue_t.java index e418b7797c4..44c170ebcf6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFieldValue_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlFieldValue_t.java @@ -31,7 +31,7 @@ public class nvmlFieldValue_t extends Pointer { return (nvmlFieldValue_t)super.position(position); } @Override public nvmlFieldValue_t getPointer(long i) { - return new nvmlFieldValue_t((Pointer)this).position(position + i); + return new nvmlFieldValue_t((Pointer)this).offsetAddress(i); } /** ID of the NVML field to retrieve. This must be set before any call that uses this struct. See the constants starting with NVML_FI_ above. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceInfo_t.java index 6445e84aeed..0ff9c548fe6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceInfo_t.java @@ -28,7 +28,7 @@ public class nvmlGpuInstanceInfo_t extends Pointer { return (nvmlGpuInstanceInfo_t)super.position(position); } @Override public nvmlGpuInstanceInfo_t getPointer(long i) { - return new nvmlGpuInstanceInfo_t((Pointer)this).position(position + i); + return new nvmlGpuInstanceInfo_t((Pointer)this).offsetAddress(i); } /** Parent device */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstancePlacement_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstancePlacement_t.java index f4ee8cb365f..bf4a744b0bf 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstancePlacement_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstancePlacement_t.java @@ -28,7 +28,7 @@ public class nvmlGpuInstancePlacement_t extends Pointer { return (nvmlGpuInstancePlacement_t)super.position(position); } @Override public nvmlGpuInstancePlacement_t getPointer(long i) { - return new nvmlGpuInstancePlacement_t((Pointer)this).position(position + i); + return new nvmlGpuInstancePlacement_t((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int start(); public native nvmlGpuInstancePlacement_t start(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceProfileInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceProfileInfo_t.java index ccd40816f62..6c8f3c191ab 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceProfileInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGpuInstanceProfileInfo_t.java @@ -28,7 +28,7 @@ public class nvmlGpuInstanceProfileInfo_t extends Pointer { return (nvmlGpuInstanceProfileInfo_t)super.position(position); } @Override public nvmlGpuInstanceProfileInfo_t getPointer(long i) { - return new nvmlGpuInstanceProfileInfo_t((Pointer)this).position(position + i); + return new nvmlGpuInstanceProfileInfo_t((Pointer)this).offsetAddress(i); } /** Unique profile ID within the device */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeature_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeature_t.java index c5c4cff1150..e8e495109ec 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeature_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeature_t.java @@ -31,7 +31,7 @@ public class nvmlGridLicensableFeature_t extends Pointer { return (nvmlGridLicensableFeature_t)super.position(position); } @Override public nvmlGridLicensableFeature_t getPointer(long i) { - return new nvmlGridLicensableFeature_t((Pointer)this).position(position + i); + return new nvmlGridLicensableFeature_t((Pointer)this).offsetAddress(i); } /** Licensed feature code */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeatures_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeatures_t.java index ee26bd528dc..ca641ac3ff0 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeatures_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlGridLicensableFeatures_t.java @@ -31,7 +31,7 @@ public class nvmlGridLicensableFeatures_t extends Pointer { return (nvmlGridLicensableFeatures_t)super.position(position); } @Override public nvmlGridLicensableFeatures_t getPointer(long i) { - return new nvmlGridLicensableFeatures_t((Pointer)this).position(position + i); + return new nvmlGridLicensableFeatures_t((Pointer)this).offsetAddress(i); } /** Non-zero if vGPU Software Licensing is supported on the system, otherwise zero */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlHwbcEntry_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlHwbcEntry_t.java index d11cd08a7a8..cb2cd9fd975 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlHwbcEntry_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlHwbcEntry_t.java @@ -31,7 +31,7 @@ public class nvmlHwbcEntry_t extends Pointer { return (nvmlHwbcEntry_t)super.position(position); } @Override public nvmlHwbcEntry_t getPointer(long i) { - return new nvmlHwbcEntry_t((Pointer)this).position(position + i); + return new nvmlHwbcEntry_t((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int hwbcId(); public native nvmlHwbcEntry_t hwbcId(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlLedState_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlLedState_t.java index f58831bf2dc..7b6a31715af 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlLedState_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlLedState_t.java @@ -32,7 +32,7 @@ public class nvmlLedState_t extends Pointer { return (nvmlLedState_t)super.position(position); } @Override public nvmlLedState_t getPointer(long i) { - return new nvmlLedState_t((Pointer)this).position(position + i); + return new nvmlLedState_t((Pointer)this).offsetAddress(i); } /** If amber, a text description of the cause */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlMemory_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlMemory_t.java index ceb2935c34e..6132dcd071c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlMemory_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlMemory_t.java @@ -31,7 +31,7 @@ public class nvmlMemory_t extends Pointer { return (nvmlMemory_t)super.position(position); } @Override public nvmlMemory_t getPointer(long i) { - return new nvmlMemory_t((Pointer)this).position(position + i); + return new nvmlMemory_t((Pointer)this).offsetAddress(i); } /** Total installed FB memory (in bytes) */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlNvLinkUtilizationControl_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlNvLinkUtilizationControl_t.java index c39240707c9..79afaaca3b7 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlNvLinkUtilizationControl_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlNvLinkUtilizationControl_t.java @@ -31,7 +31,7 @@ public class nvmlNvLinkUtilizationControl_t extends Pointer { return (nvmlNvLinkUtilizationControl_t)super.position(position); } @Override public nvmlNvLinkUtilizationControl_t getPointer(long i) { - return new nvmlNvLinkUtilizationControl_t((Pointer)this).position(position + i); + return new nvmlNvLinkUtilizationControl_t((Pointer)this).offsetAddress(i); } public native @Cast("nvmlNvLinkUtilizationCountUnits_t") int units(); public native nvmlNvLinkUtilizationControl_t units(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPSUInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPSUInfo_t.java index 1f4ff10605b..9000b891f29 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPSUInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPSUInfo_t.java @@ -43,7 +43,7 @@ public class nvmlPSUInfo_t extends Pointer { return (nvmlPSUInfo_t)super.position(position); } @Override public nvmlPSUInfo_t getPointer(long i) { - return new nvmlPSUInfo_t((Pointer)this).position(position + i); + return new nvmlPSUInfo_t((Pointer)this).offsetAddress(i); } /** The power supply state */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPciInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPciInfo_t.java index 3836ee01c16..e0e64518f55 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPciInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlPciInfo_t.java @@ -31,7 +31,7 @@ public class nvmlPciInfo_t extends Pointer { return (nvmlPciInfo_t)super.position(position); } @Override public nvmlPciInfo_t getPointer(long i) { - return new nvmlPciInfo_t((Pointer)this).position(position + i); + return new nvmlPciInfo_t((Pointer)this).offsetAddress(i); } /** The legacy tuple domain:bus:device.function PCI identifier (& NULL terminator) */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessInfo_t.java index 60db258311b..d24988b5115 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessInfo_t.java @@ -31,7 +31,7 @@ public class nvmlProcessInfo_t extends Pointer { return (nvmlProcessInfo_t)super.position(position); } @Override public nvmlProcessInfo_t getPointer(long i) { - return new nvmlProcessInfo_t((Pointer)this).position(position + i); + return new nvmlProcessInfo_t((Pointer)this).offsetAddress(i); } /** Process ID */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessUtilizationSample_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessUtilizationSample_t.java index 3e680aadbe6..aef89b69147 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessUtilizationSample_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlProcessUtilizationSample_t.java @@ -31,7 +31,7 @@ public class nvmlProcessUtilizationSample_t extends Pointer { return (nvmlProcessUtilizationSample_t)super.position(position); } @Override public nvmlProcessUtilizationSample_t getPointer(long i) { - return new nvmlProcessUtilizationSample_t((Pointer)this).position(position + i); + return new nvmlProcessUtilizationSample_t((Pointer)this).offsetAddress(i); } /** PID of process */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlRowRemapperHistogramValues_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlRowRemapperHistogramValues_t.java index 30ac62257af..9022ada89ee 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlRowRemapperHistogramValues_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlRowRemapperHistogramValues_t.java @@ -34,7 +34,7 @@ public class nvmlRowRemapperHistogramValues_t extends Pointer { return (nvmlRowRemapperHistogramValues_t)super.position(position); } @Override public nvmlRowRemapperHistogramValues_t getPointer(long i) { - return new nvmlRowRemapperHistogramValues_t((Pointer)this).position(position + i); + return new nvmlRowRemapperHistogramValues_t((Pointer)this).offsetAddress(i); } public native @Cast("unsigned int") int max(); public native nvmlRowRemapperHistogramValues_t max(int setter); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlSample_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlSample_t.java index e5167fbea50..502229879b7 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlSample_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlSample_t.java @@ -31,7 +31,7 @@ public class nvmlSample_t extends Pointer { return (nvmlSample_t)super.position(position); } @Override public nvmlSample_t getPointer(long i) { - return new nvmlSample_t((Pointer)this).position(position + i); + return new nvmlSample_t((Pointer)this).offsetAddress(i); } /** CPU Timestamp in microseconds */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanInfo_t.java index 67f400e81ae..5d2e1dbdb83 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanInfo_t.java @@ -31,7 +31,7 @@ public class nvmlUnitFanInfo_t extends Pointer { return (nvmlUnitFanInfo_t)super.position(position); } @Override public nvmlUnitFanInfo_t getPointer(long i) { - return new nvmlUnitFanInfo_t((Pointer)this).position(position + i); + return new nvmlUnitFanInfo_t((Pointer)this).offsetAddress(i); } /** Fan speed (RPM) */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanSpeeds_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanSpeeds_t.java index 3f1a9febc87..1bc4cc3fa30 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanSpeeds_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitFanSpeeds_t.java @@ -31,7 +31,7 @@ public class nvmlUnitFanSpeeds_t extends Pointer { return (nvmlUnitFanSpeeds_t)super.position(position); } @Override public nvmlUnitFanSpeeds_t getPointer(long i) { - return new nvmlUnitFanSpeeds_t((Pointer)this).position(position + i); + return new nvmlUnitFanSpeeds_t((Pointer)this).offsetAddress(i); } /** Fan speed data for each fan */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitInfo_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitInfo_t.java index 7e394bed15f..79ea35312df 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitInfo_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUnitInfo_t.java @@ -31,7 +31,7 @@ public class nvmlUnitInfo_t extends Pointer { return (nvmlUnitInfo_t)super.position(position); } @Override public nvmlUnitInfo_t getPointer(long i) { - return new nvmlUnitInfo_t((Pointer)this).position(position + i); + return new nvmlUnitInfo_t((Pointer)this).offsetAddress(i); } /** Product name */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUtilization_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUtilization_t.java index c57ac11c9eb..0eb082a73ee 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUtilization_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlUtilization_t.java @@ -32,7 +32,7 @@ public class nvmlUtilization_t extends Pointer { return (nvmlUtilization_t)super.position(position); } @Override public nvmlUtilization_t getPointer(long i) { - return new nvmlUtilization_t((Pointer)this).position(position + i); + return new nvmlUtilization_t((Pointer)this).offsetAddress(i); } /** Percent of time over the past sample period during which one or more kernels was executing on the GPU */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlValue_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlValue_t.java index 53983611c27..993122168cd 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlValue_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlValue_t.java @@ -32,7 +32,7 @@ public class nvmlValue_t extends Pointer { return (nvmlValue_t)super.position(position); } @Override public nvmlValue_t getPointer(long i) { - return new nvmlValue_t((Pointer)this).position(position + i); + return new nvmlValue_t((Pointer)this).offsetAddress(i); } /** If the value is double */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuInstanceUtilizationSample_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuInstanceUtilizationSample_t.java index e26471a166c..6b2a4ee7c1c 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuInstanceUtilizationSample_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuInstanceUtilizationSample_t.java @@ -31,7 +31,7 @@ public class nvmlVgpuInstanceUtilizationSample_t extends Pointer { return (nvmlVgpuInstanceUtilizationSample_t)super.position(position); } @Override public nvmlVgpuInstanceUtilizationSample_t getPointer(long i) { - return new nvmlVgpuInstanceUtilizationSample_t((Pointer)this).position(position + i); + return new nvmlVgpuInstanceUtilizationSample_t((Pointer)this).offsetAddress(i); } /** vGPU Instance */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuMetadata_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuMetadata_t.java index 4ef9b770f81..4a979fe6422 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuMetadata_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuMetadata_t.java @@ -31,7 +31,7 @@ public class nvmlVgpuMetadata_t extends Pointer { return (nvmlVgpuMetadata_t)super.position(position); } @Override public nvmlVgpuMetadata_t getPointer(long i) { - return new nvmlVgpuMetadata_t((Pointer)this).position(position + i); + return new nvmlVgpuMetadata_t((Pointer)this).offsetAddress(i); } /** Current version of the structure */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuCompatibility_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuCompatibility_t.java index 262e2843361..152d37e83b4 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuCompatibility_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuCompatibility_t.java @@ -31,7 +31,7 @@ public class nvmlVgpuPgpuCompatibility_t extends Pointer { return (nvmlVgpuPgpuCompatibility_t)super.position(position); } @Override public nvmlVgpuPgpuCompatibility_t getPointer(long i) { - return new nvmlVgpuPgpuCompatibility_t((Pointer)this).position(position + i); + return new nvmlVgpuPgpuCompatibility_t((Pointer)this).offsetAddress(i); } /** Compatibility of vGPU VM. See \ref nvmlVgpuVmCompatibility_t */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuMetadata_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuMetadata_t.java index 5b6510e12c5..3a51d333aeb 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuMetadata_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuPgpuMetadata_t.java @@ -31,7 +31,7 @@ public class nvmlVgpuPgpuMetadata_t extends Pointer { return (nvmlVgpuPgpuMetadata_t)super.position(position); } @Override public nvmlVgpuPgpuMetadata_t getPointer(long i) { - return new nvmlVgpuPgpuMetadata_t((Pointer)this).position(position + i); + return new nvmlVgpuPgpuMetadata_t((Pointer)this).offsetAddress(i); } /** Current version of the structure */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuProcessUtilizationSample_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuProcessUtilizationSample_t.java index 5d06a0fd2e1..2a5e1181d12 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuProcessUtilizationSample_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuProcessUtilizationSample_t.java @@ -31,7 +31,7 @@ public class nvmlVgpuProcessUtilizationSample_t extends Pointer { return (nvmlVgpuProcessUtilizationSample_t)super.position(position); } @Override public nvmlVgpuProcessUtilizationSample_t getPointer(long i) { - return new nvmlVgpuProcessUtilizationSample_t((Pointer)this).position(position + i); + return new nvmlVgpuProcessUtilizationSample_t((Pointer)this).offsetAddress(i); } /** vGPU Instance */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuVersion_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuVersion_t.java index ff458719a1b..4b892de9521 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuVersion_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlVgpuVersion_t.java @@ -40,7 +40,7 @@ public class nvmlVgpuVersion_t extends Pointer { return (nvmlVgpuVersion_t)super.position(position); } @Override public nvmlVgpuVersion_t getPointer(long i) { - return new nvmlVgpuVersion_t((Pointer)this).position(position + i); + return new nvmlVgpuVersion_t((Pointer)this).offsetAddress(i); } /** Minimum vGPU version. */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlViolationTime_t.java b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlViolationTime_t.java index 099866527b2..2e828d76473 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlViolationTime_t.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/nvml/nvmlViolationTime_t.java @@ -31,7 +31,7 @@ public class nvmlViolationTime_t extends Pointer { return (nvmlViolationTime_t)super.position(position); } @Override public nvmlViolationTime_t getPointer(long i) { - return new nvmlViolationTime_t((Pointer)this).position(position + i); + return new nvmlViolationTime_t((Pointer)this).offsetAddress(i); } /** referenceTime represents CPU timestamp in microseconds */ diff --git a/dnnl/README.md b/dnnl/README.md index d5490176340..ce48b5c58fc 100644 --- a/dnnl/README.md +++ b/dnnl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * DNNL 2.2 https://01.org/dnnl + * DNNL 2.2.2 https://01.org/dnnl Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco dnnl-platform - 2.2-1.5.6-SNAPSHOT + 2.2.2-1.5.6-SNAPSHOT diff --git a/dnnl/cppbuild.sh b/dnnl/cppbuild.sh index de62190829e..c6d8887bdf1 100755 --- a/dnnl/cppbuild.sh +++ b/dnnl/cppbuild.sh @@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB export DNNL_GPU_RUNTIME="OCL" TBB_VERSION=2020.3 -MKLDNN_VERSION=2.2.1 +MKLDNN_VERSION=2.2.2 download https://github.com/oneapi-src/oneTBB/archive/v$TBB_VERSION.tar.gz oneTBB-$TBB_VERSION.tar.bz2 download https://github.com/oneapi-src/oneDNN/archive/v$MKLDNN_VERSION.tar.gz oneDNN-$MKLDNN_VERSION.tar.bz2 diff --git a/dnnl/platform/pom.xml b/dnnl/platform/pom.xml index fcc399dd1f3..09be4f90700 100644 --- a/dnnl/platform/pom.xml +++ b/dnnl/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} JavaCPP Presets Platform for DNNL diff --git a/dnnl/pom.xml b/dnnl/pom.xml index 730ea812f10..e8c4351b4c8 100644 --- a/dnnl/pom.xml +++ b/dnnl/pom.xml @@ -11,7 +11,7 @@ org.bytedeco dnnl - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} JavaCPP Presets for DNNL diff --git a/dnnl/samples/pom.xml b/dnnl/samples/pom.xml index 1944d3f4447..256fc682a16 100644 --- a/dnnl/samples/pom.xml +++ b/dnnl/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 2.2.1-1.5.6-SNAPSHOT + 2.2.2-1.5.6-SNAPSHOT diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/IntMemoryMap.java b/dnnl/src/gen/java/org/bytedeco/dnnl/IntMemoryMap.java index a162f092147..512d0459551 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/IntMemoryMap.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/IntMemoryMap.java @@ -27,6 +27,7 @@ public class IntMemoryMap extends Pointer { @Index public native @ByRef memory get(int i); public native IntMemoryMap put(int i, memory value); + public native void erase(@ByVal Iterator pos); public native @ByVal Iterator begin(); public native @ByVal Iterator end(); @NoOffset @Name("iterator") public static class Iterator extends Pointer { diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_backward.java index 4ed16b06cd3..8460ecae0d5 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_backward.java @@ -26,7 +26,7 @@ public class batch_normalization_backward extends primitive { return (batch_normalization_backward)super.position(position); } @Override public batch_normalization_backward getPointer(long i) { - return new batch_normalization_backward((Pointer)this).position(position + i); + return new batch_normalization_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a batch normalization backward propagation primitive. */ @@ -78,7 +78,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_forward.java index 7125f6bcdf1..7d555affecf 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/batch_normalization_forward.java @@ -48,7 +48,7 @@ public class batch_normalization_forward extends primitive { return (batch_normalization_forward)super.position(position); } @Override public batch_normalization_forward getPointer(long i) { - return new batch_normalization_forward((Pointer)this).position(position + i); + return new batch_normalization_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a batch normalization forward propagation primitive. */ @@ -99,7 +99,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/binary.java b/dnnl/src/gen/java/org/bytedeco/dnnl/binary.java index f2b211d4325..8a24c98453e 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/binary.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/binary.java @@ -36,7 +36,7 @@ public class binary extends primitive { return (binary)super.position(position); } @Override public binary getPointer(long i) { - return new binary((Pointer)this).position(position + i); + return new binary((Pointer)this).offsetAddress(i); } /** Descriptor for an elementwise binary operator primitive. */ @@ -51,7 +51,7 @@ public class binary extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } /** Underlying C operation descriptor. */ @@ -92,7 +92,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java b/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java index c5c35655b2c..1397b14b1f8 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/concat.java @@ -27,7 +27,7 @@ public class concat extends primitive { return (concat)super.position(position); } @Override public concat getPointer(long i) { - return new concat((Pointer)this).position(position + i); + return new concat((Pointer)this).offsetAddress(i); } /** Primitive descriptor for a concat primitive. */ @@ -55,7 +55,7 @@ public static class primitive_desc extends primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_data.java b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_data.java index 0e704ed0d48..348d1336198 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_data.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_data.java @@ -26,7 +26,7 @@ public class convolution_backward_data extends primitive { return (convolution_backward_data)super.position(position); } @Override public convolution_backward_data getPointer(long i) { - return new convolution_backward_data((Pointer)this).position(position + i); + return new convolution_backward_data((Pointer)this).offsetAddress(i); } @@ -221,7 +221,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_weights.java b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_weights.java index 08cf2ce549c..c3083cbf3bf 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_weights.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_backward_weights.java @@ -26,7 +26,7 @@ public class convolution_backward_weights extends primitive { return (convolution_backward_weights)super.position(position); } @Override public convolution_backward_weights getPointer(long i) { - return new convolution_backward_weights((Pointer)this).position(position + i); + return new convolution_backward_weights((Pointer)this).offsetAddress(i); } /** Descriptor for a convolution weights gradient primitive. */ @@ -418,7 +418,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_forward.java index b3694511e96..2854716bb6c 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/convolution_forward.java @@ -38,7 +38,7 @@ public class convolution_forward extends primitive { return (convolution_forward)super.position(position); } @Override public convolution_forward getPointer(long i) { - return new convolution_forward((Pointer)this).position(position + i); + return new convolution_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a convolution forward propagation primitive. */ @@ -430,7 +430,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_data.java b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_data.java index 9588f60c1d7..6fb98cad025 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_data.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_data.java @@ -26,7 +26,7 @@ public class deconvolution_backward_data extends primitive { return (deconvolution_backward_data)super.position(position); } @Override public deconvolution_backward_data getPointer(long i) { - return new deconvolution_backward_data((Pointer)this).position(position + i); + return new deconvolution_backward_data((Pointer)this).offsetAddress(i); } /** Descriptor for a deconvolution backward propagation primitive. */ @@ -218,7 +218,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_weights.java b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_weights.java index 1a380c4ba75..dd55b46ea54 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_weights.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_backward_weights.java @@ -26,7 +26,7 @@ public class deconvolution_backward_weights extends primitive { return (deconvolution_backward_weights)super.position(position); } @Override public deconvolution_backward_weights getPointer(long i) { - return new deconvolution_backward_weights((Pointer)this).position(position + i); + return new deconvolution_backward_weights((Pointer)this).offsetAddress(i); } /** Descriptor for a deconvolution weights gradient primitive. */ @@ -414,7 +414,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_forward.java index 11b23dc49ef..534a04af9f8 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/deconvolution_forward.java @@ -36,7 +36,7 @@ public class deconvolution_forward extends primitive { return (deconvolution_forward)super.position(position); } @Override public deconvolution_forward getPointer(long i) { - return new deconvolution_forward((Pointer)this).position(position + i); + return new deconvolution_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a deconvolution forward propagation primitive. */ @@ -424,7 +424,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_batch_normalization_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_batch_normalization_desc_t.java index c8389f4336b..f537e1182c2 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_batch_normalization_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_batch_normalization_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_batch_normalization_desc_t extends Pointer { return (dnnl_batch_normalization_desc_t)super.position(position); } @Override public dnnl_batch_normalization_desc_t getPointer(long i) { - return new dnnl_batch_normalization_desc_t((Pointer)this).position(position + i); + return new dnnl_batch_normalization_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_binary_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_binary_desc_t.java index 66b0bbf9b83..9a8ca63e996 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_binary_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_binary_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_binary_desc_t extends Pointer { return (dnnl_binary_desc_t)super.position(position); } @Override public dnnl_binary_desc_t getPointer(long i) { - return new dnnl_binary_desc_t((Pointer)this).position(position + i); + return new dnnl_binary_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_blocking_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_blocking_desc_t.java index e091634d4c8..62363b8078a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_blocking_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_blocking_desc_t.java @@ -31,7 +31,7 @@ public class dnnl_blocking_desc_t extends Pointer { return (dnnl_blocking_desc_t)super.position(position); } @Override public dnnl_blocking_desc_t getPointer(long i) { - return new dnnl_blocking_desc_t((Pointer)this).position(position + i); + return new dnnl_blocking_desc_t((Pointer)this).offsetAddress(i); } /** The strides between the outermost blocks. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_convolution_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_convolution_desc_t.java index 481f37caadd..6505ce85a29 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_convolution_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_convolution_desc_t.java @@ -38,7 +38,7 @@ public class dnnl_convolution_desc_t extends Pointer { return (dnnl_convolution_desc_t)super.position(position); } @Override public dnnl_convolution_desc_t getPointer(long i) { - return new dnnl_convolution_desc_t((Pointer)this).position(position + i); + return new dnnl_convolution_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_eltwise_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_eltwise_desc_t.java index 8439ea9bc0e..460c49d0805 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_eltwise_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_eltwise_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_eltwise_desc_t extends Pointer { return (dnnl_eltwise_desc_t)super.position(position); } @Override public dnnl_eltwise_desc_t getPointer(long i) { - return new dnnl_eltwise_desc_t((Pointer)this).position(position + i); + return new dnnl_eltwise_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_engine_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_engine_handle.java index e1fbddcaf74..3c11aae10e9 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_engine_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_engine_handle.java @@ -38,7 +38,7 @@ public class dnnl_engine_handle extends Pointer { return (dnnl_engine_handle)super.position(position); } @Override public dnnl_engine_handle getPointer(long i) { - return new dnnl_engine_handle((Pointer)this).position(position + i); + return new dnnl_engine_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_exec_arg_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_exec_arg_t.java index 2f297276749..c353ad0eeea 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_exec_arg_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_exec_arg_t.java @@ -33,7 +33,7 @@ public class dnnl_exec_arg_t extends Pointer { return (dnnl_exec_arg_t)super.position(position); } @Override public dnnl_exec_arg_t getPointer(long i) { - return new dnnl_exec_arg_t((Pointer)this).position(position + i); + return new dnnl_exec_arg_t((Pointer)this).offsetAddress(i); } /** An argument index, e.g. DNNL_ARG_SRC */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_inner_product_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_inner_product_desc_t.java index 5cfabe16c8c..85cab11925e 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_inner_product_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_inner_product_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_inner_product_desc_t extends Pointer { return (dnnl_inner_product_desc_t)super.position(position); } @Override public dnnl_inner_product_desc_t getPointer(long i) { - return new dnnl_inner_product_desc_t((Pointer)this).position(position + i); + return new dnnl_inner_product_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_layer_normalization_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_layer_normalization_desc_t.java index 9343773145f..f4cbb0ed382 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_layer_normalization_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_layer_normalization_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_layer_normalization_desc_t extends Pointer { return (dnnl_layer_normalization_desc_t)super.position(position); } @Override public dnnl_layer_normalization_desc_t getPointer(long i) { - return new dnnl_layer_normalization_desc_t((Pointer)this).position(position + i); + return new dnnl_layer_normalization_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_lrn_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_lrn_desc_t.java index 0aa182184fc..63d9f1c8a21 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_lrn_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_lrn_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_lrn_desc_t extends Pointer { return (dnnl_lrn_desc_t)super.position(position); } @Override public dnnl_lrn_desc_t getPointer(long i) { - return new dnnl_lrn_desc_t((Pointer)this).position(position + i); + return new dnnl_lrn_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_matmul_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_matmul_desc_t.java index d8178c57a33..64935ad42f2 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_matmul_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_matmul_desc_t.java @@ -40,7 +40,7 @@ public class dnnl_matmul_desc_t extends Pointer { return (dnnl_matmul_desc_t)super.position(position); } @Override public dnnl_matmul_desc_t getPointer(long i) { - return new dnnl_matmul_desc_t((Pointer)this).position(position + i); + return new dnnl_matmul_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_desc_t.java index fc96a3574d2..36679838ba3 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_desc_t.java @@ -32,7 +32,7 @@ public class dnnl_memory_desc_t extends Pointer { return (dnnl_memory_desc_t)super.position(position); } @Override public dnnl_memory_desc_t getPointer(long i) { - return new dnnl_memory_desc_t((Pointer)this).position(position + i); + return new dnnl_memory_desc_t((Pointer)this).offsetAddress(i); } /** Number of dimensions */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_extra_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_extra_desc_t.java index 3d619f21dd2..e7d3c3453c3 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_extra_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_extra_desc_t.java @@ -29,7 +29,7 @@ public class dnnl_memory_extra_desc_t extends Pointer { return (dnnl_memory_extra_desc_t)super.position(position); } @Override public dnnl_memory_extra_desc_t getPointer(long i) { - return new dnnl_memory_extra_desc_t((Pointer)this).position(position + i); + return new dnnl_memory_extra_desc_t((Pointer)this).offsetAddress(i); } /** The flags contain arbitrary extra information, such as compensation. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_handle.java index 42f6c9ceafc..d428ea2bf12 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_memory_handle.java @@ -24,7 +24,7 @@ public class dnnl_memory_handle extends Pointer { return (dnnl_memory_handle)super.position(position); } @Override public dnnl_memory_handle getPointer(long i) { - return new dnnl_memory_handle((Pointer)this).position(position + i); + return new dnnl_memory_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_desc_t.java index 4a008573e9c..474e46736d1 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_pooling_desc_t extends Pointer { return (dnnl_pooling_desc_t)super.position(position); } @Override public dnnl_pooling_desc_t getPointer(long i) { - return new dnnl_pooling_desc_t((Pointer)this).position(position + i); + return new dnnl_pooling_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_v2_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_v2_desc_t.java index 6f817e3a0d3..512132b2725 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_v2_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_pooling_v2_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_pooling_v2_desc_t extends Pointer { return (dnnl_pooling_v2_desc_t)super.position(position); } @Override public dnnl_pooling_v2_desc_t getPointer(long i) { - return new dnnl_pooling_v2_desc_t((Pointer)this).position(position + i); + return new dnnl_pooling_v2_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_post_ops_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_post_ops_handle.java index c9d45bbac16..34e99d35a58 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_post_ops_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_post_ops_handle.java @@ -24,7 +24,7 @@ public class dnnl_post_ops_handle extends Pointer { return (dnnl_post_ops_handle)super.position(position); } @Override public dnnl_post_ops_handle getPointer(long i) { - return new dnnl_post_ops_handle((Pointer)this).position(position + i); + return new dnnl_post_ops_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_prelu_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_prelu_desc_t.java index f4a2cf164bb..30245bfaa30 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_prelu_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_prelu_desc_t.java @@ -32,7 +32,7 @@ public class dnnl_prelu_desc_t extends Pointer { return (dnnl_prelu_desc_t)super.position(position); } @Override public dnnl_prelu_desc_t getPointer(long i) { - return new dnnl_prelu_desc_t((Pointer)this).position(position + i); + return new dnnl_prelu_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_attr_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_attr_handle.java index 5a65f71a713..48f2874207d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_attr_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_attr_handle.java @@ -24,7 +24,7 @@ public class dnnl_primitive_attr_handle extends Pointer { return (dnnl_primitive_attr_handle)super.position(position); } @Override public dnnl_primitive_attr_handle getPointer(long i) { - return new dnnl_primitive_attr_handle((Pointer)this).position(position + i); + return new dnnl_primitive_attr_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_desc_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_desc_handle.java index ec34ec2425d..43d8aaf0f0d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_desc_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_desc_handle.java @@ -24,7 +24,7 @@ public class dnnl_primitive_desc_handle extends Pointer { return (dnnl_primitive_desc_handle)super.position(position); } @Override public dnnl_primitive_desc_handle getPointer(long i) { - return new dnnl_primitive_desc_handle((Pointer)this).position(position + i); + return new dnnl_primitive_desc_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_handle.java index 0bc0fdfd224..e4514222777 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_primitive_handle.java @@ -24,7 +24,7 @@ public class dnnl_primitive_handle extends Pointer { return (dnnl_primitive_handle)super.position(position); } @Override public dnnl_primitive_handle getPointer(long i) { - return new dnnl_primitive_handle((Pointer)this).position(position + i); + return new dnnl_primitive_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_reduction_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_reduction_desc_t.java index f2a5b0dd503..2830021df33 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_reduction_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_reduction_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_reduction_desc_t extends Pointer { return (dnnl_reduction_desc_t)super.position(position); } @Override public dnnl_reduction_desc_t getPointer(long i) { - return new dnnl_reduction_desc_t((Pointer)this).position(position + i); + return new dnnl_reduction_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_resampling_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_resampling_desc_t.java index 51d015ab589..9a0ca1dfa92 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_resampling_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_resampling_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_resampling_desc_t extends Pointer { return (dnnl_resampling_desc_t)super.position(position); } @Override public dnnl_resampling_desc_t getPointer(long i) { - return new dnnl_resampling_desc_t((Pointer)this).position(position + i); + return new dnnl_resampling_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_desc_t.java index d8c08be7fab..f3450ee1e9c 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_desc_t.java @@ -29,7 +29,7 @@ public class dnnl_rnn_desc_t extends Pointer { return (dnnl_rnn_desc_t)super.position(position); } @Override public dnnl_rnn_desc_t getPointer(long i) { - return new dnnl_rnn_desc_t((Pointer)this).position(position + i); + return new dnnl_rnn_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_packed_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_packed_desc_t.java index 9bbcd97058d..7667134f14d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_packed_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_rnn_packed_desc_t.java @@ -29,7 +29,7 @@ public class dnnl_rnn_packed_desc_t extends Pointer { return (dnnl_rnn_packed_desc_t)super.position(position); } @Override public dnnl_rnn_packed_desc_t getPointer(long i) { - return new dnnl_rnn_packed_desc_t((Pointer)this).position(position + i); + return new dnnl_rnn_packed_desc_t((Pointer)this).offsetAddress(i); } public native @Cast("dnnl_rnn_packed_memory_format_t") int format(); public native dnnl_rnn_packed_desc_t format(int setter); diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_shuffle_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_shuffle_desc_t.java index 571ff8f750c..5617bcd640d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_shuffle_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_shuffle_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_shuffle_desc_t extends Pointer { return (dnnl_shuffle_desc_t)super.position(position); } @Override public dnnl_shuffle_desc_t getPointer(long i) { - return new dnnl_shuffle_desc_t((Pointer)this).position(position + i); + return new dnnl_shuffle_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_softmax_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_softmax_desc_t.java index 35181f4887f..f3b3d05ea1c 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_softmax_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_softmax_desc_t.java @@ -34,7 +34,7 @@ public class dnnl_softmax_desc_t extends Pointer { return (dnnl_softmax_desc_t)super.position(position); } @Override public dnnl_softmax_desc_t getPointer(long i) { - return new dnnl_softmax_desc_t((Pointer)this).position(position + i); + return new dnnl_softmax_desc_t((Pointer)this).offsetAddress(i); } /** The kind of primitive. Used for self-identifying the primitive diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_stream_handle.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_stream_handle.java index 1a808395c9b..deb7c61ef00 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_stream_handle.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_stream_handle.java @@ -24,7 +24,7 @@ public class dnnl_stream_handle extends Pointer { return (dnnl_stream_handle)super.position(position); } @Override public dnnl_stream_handle getPointer(long i) { - return new dnnl_stream_handle((Pointer)this).position(position + i); + return new dnnl_stream_handle((Pointer)this).offsetAddress(i); } /** Constructs an empty handle object. diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_version_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_version_t.java index 04bb84487f4..00db294dbf3 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_version_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_version_t.java @@ -30,7 +30,7 @@ public class dnnl_version_t extends Pointer { return (dnnl_version_t)super.position(position); } @Override public dnnl_version_t getPointer(long i) { - return new dnnl_version_t((Pointer)this).position(position + i); + return new dnnl_version_t((Pointer)this).offsetAddress(i); } /** Major version */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_wino_desc_t.java b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_wino_desc_t.java index be2aa63e3cc..1db5d237719 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_wino_desc_t.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/dnnl_wino_desc_t.java @@ -29,7 +29,7 @@ public class dnnl_wino_desc_t extends Pointer { return (dnnl_wino_desc_t)super.position(position); } @Override public dnnl_wino_desc_t getPointer(long i) { - return new dnnl_wino_desc_t((Pointer)this).position(position + i); + return new dnnl_wino_desc_t((Pointer)this).offsetAddress(i); } public native @Cast("dnnl_wino_memory_format_t") int wino_format(); public native dnnl_wino_desc_t wino_format(int setter); diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_backward.java index 787b9e3413e..45292f1570c 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_backward.java @@ -26,7 +26,7 @@ public class eltwise_backward extends primitive { return (eltwise_backward)super.position(position); } @Override public eltwise_backward getPointer(long i) { - return new eltwise_backward((Pointer)this).position(position + i); + return new eltwise_backward((Pointer)this).offsetAddress(i); } /** Descriptor for an elementwise backward propagation primitive. */ @@ -76,7 +76,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_forward.java index 65a661a9a8e..0cec7776f04 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/eltwise_forward.java @@ -49,7 +49,7 @@ public class eltwise_forward extends primitive { return (eltwise_forward)super.position(position); } @Override public eltwise_forward getPointer(long i) { - return new eltwise_forward((Pointer)this).position(position + i); + return new eltwise_forward((Pointer)this).offsetAddress(i); } /** Descriptor for an elementwise forward propagation primitive. */ @@ -100,7 +100,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/engine.java b/dnnl/src/gen/java/org/bytedeco/dnnl/engine.java index 3f0b95295d9..39c3429ac99 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/engine.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/engine.java @@ -40,7 +40,7 @@ public class engine extends dnnl_engine_handle { return (engine)super.position(position); } @Override public engine getPointer(long i) { - return new engine((Pointer)this).position(position + i); + return new engine((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java index 85ee0dc6956..d2222f2346a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java @@ -2361,7 +2361,7 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int DNNL_VERSION_MINOR = 2; /** Patch version */ -public static final int DNNL_VERSION_PATCH = 1; +public static final int DNNL_VERSION_PATCH = 2; /** Git commit hash */ public static native @MemberGetter String DNNL_VERSION_HASH(); diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/gru_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/gru_backward.java index d45bbeb3391..269ad497209 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/gru_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/gru_backward.java @@ -26,7 +26,7 @@ public class gru_backward extends primitive { return (gru_backward)super.position(position); } @Override public gru_backward getPointer(long i) { - return new gru_backward((Pointer)this).position(position + i); + return new gru_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a GRU backward propagation primitive. */ @@ -224,7 +224,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/gru_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/gru_forward.java index 6b325d5a0e8..3b165915aee 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/gru_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/gru_forward.java @@ -26,7 +26,7 @@ public class gru_forward extends primitive { return (gru_forward)super.position(position); } @Override public gru_forward getPointer(long i) { - return new gru_forward((Pointer)this).position(position + i); + return new gru_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a GRU forward propagation primitive. */ @@ -156,7 +156,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_data.java b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_data.java index c97e76c5cb0..8775008e68e 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_data.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_data.java @@ -26,7 +26,7 @@ public class inner_product_backward_data extends primitive { return (inner_product_backward_data)super.position(position); } @Override public inner_product_backward_data getPointer(long i) { - return new inner_product_backward_data((Pointer)this).position(position + i); + return new inner_product_backward_data((Pointer)this).offsetAddress(i); } /** Descriptor for an inner product backward propagation primitive. */ @@ -71,7 +71,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_weights.java b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_weights.java index 5150a5480eb..8a2ed4c6589 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_weights.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_backward_weights.java @@ -26,7 +26,7 @@ public class inner_product_backward_weights extends primitive { return (inner_product_backward_weights)super.position(position); } @Override public inner_product_backward_weights getPointer(long i) { - return new inner_product_backward_weights((Pointer)this).position(position + i); + return new inner_product_backward_weights((Pointer)this).offsetAddress(i); } /** Descriptor for an inner product weights gradient primitive. */ @@ -93,7 +93,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_forward.java index 0fc8d78ec8a..fc1a02867cc 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/inner_product_forward.java @@ -36,7 +36,7 @@ public class inner_product_forward extends primitive { return (inner_product_forward)super.position(position); } @Override public inner_product_forward getPointer(long i) { - return new inner_product_forward((Pointer)this).position(position + i); + return new inner_product_forward((Pointer)this).offsetAddress(i); } /** Descriptor for an inner product forward propagation primitive. */ @@ -119,7 +119,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_backward.java index 6b7acca8d4a..666101b9de2 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_backward.java @@ -26,7 +26,7 @@ public class layer_normalization_backward extends primitive { return (layer_normalization_backward)super.position(position); } @Override public layer_normalization_backward getPointer(long i) { - return new layer_normalization_backward((Pointer)this).position(position + i); + return new layer_normalization_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a layer normalization backward propagation primitive. */ @@ -106,7 +106,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java index c5c0ba3675b..42bda502006 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/layer_normalization_forward.java @@ -50,7 +50,7 @@ public class layer_normalization_forward extends primitive { return (layer_normalization_forward)super.position(position); } @Override public layer_normalization_forward getPointer(long i) { - return new layer_normalization_forward((Pointer)this).position(position + i); + return new layer_normalization_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a layer normalization forward propagation primitive. */ @@ -122,7 +122,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_backward.java index 14b6c79cc57..b80b81fa4e0 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_backward.java @@ -26,7 +26,7 @@ public class lbr_gru_backward extends primitive { return (lbr_gru_backward)super.position(position); } @Override public lbr_gru_backward getPointer(long i) { - return new lbr_gru_backward((Pointer)this).position(position + i); + return new lbr_gru_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a LBR GRU backward propagation primitive. */ @@ -225,7 +225,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_forward.java index f11647221ca..46157471f6e 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lbr_gru_forward.java @@ -26,7 +26,7 @@ public class lbr_gru_forward extends primitive { return (lbr_gru_forward)super.position(position); } @Override public lbr_gru_forward getPointer(long i) { - return new lbr_gru_forward((Pointer)this).position(position + i); + return new lbr_gru_forward((Pointer)this).offsetAddress(i); } /** Descriptor for an LBR GRU forward propagation primitive. */ @@ -157,7 +157,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_backward.java index e25192013a7..cb179394c8b 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_backward.java @@ -26,7 +26,7 @@ public class logsoftmax_backward extends primitive { return (logsoftmax_backward)super.position(position); } @Override public logsoftmax_backward getPointer(long i) { - return new logsoftmax_backward((Pointer)this).position(position + i); + return new logsoftmax_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a logsoftmax backward propagation primitive. */ @@ -41,7 +41,7 @@ public class logsoftmax_backward extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } public native @ByRef @Cast("dnnl_logsoftmax_desc_t*") dnnl_softmax_desc_t data(); public native desc data(dnnl_softmax_desc_t setter); @@ -77,7 +77,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_forward.java index 33f8e6e2657..cf083c18730 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/logsoftmax_forward.java @@ -36,7 +36,7 @@ public class logsoftmax_forward extends primitive { return (logsoftmax_forward)super.position(position); } @Override public logsoftmax_forward getPointer(long i) { - return new logsoftmax_forward((Pointer)this).position(position + i); + return new logsoftmax_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a logsoftmax forward propagation primitive. */ @@ -51,7 +51,7 @@ public class logsoftmax_forward extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } public native @ByRef @Cast("dnnl_logsoftmax_desc_t*") dnnl_softmax_desc_t data(); public native desc data(dnnl_softmax_desc_t setter); @@ -92,7 +92,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_backward.java index 2f2e23a1719..51caf927df9 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_backward.java @@ -26,7 +26,7 @@ public class lrn_backward extends primitive { return (lrn_backward)super.position(position); } @Override public lrn_backward getPointer(long i) { - return new lrn_backward((Pointer)this).position(position + i); + return new lrn_backward((Pointer)this).offsetAddress(i); } /** Descriptor for an LRN backward propagation primitive. */ @@ -89,7 +89,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_forward.java index 5c594749832..932325edf74 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lrn_forward.java @@ -37,7 +37,7 @@ public class lrn_forward extends primitive { return (lrn_forward)super.position(position); } @Override public lrn_forward getPointer(long i) { - return new lrn_forward((Pointer)this).position(position + i); + return new lrn_forward((Pointer)this).offsetAddress(i); } /** Descriptor for an LRN forward propagation primitive. */ @@ -101,7 +101,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_backward.java index 6446c651c1b..e1fd3963908 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_backward.java @@ -26,7 +26,7 @@ public class lstm_backward extends primitive { return (lstm_backward)super.position(position); } @Override public lstm_backward getPointer(long i) { - return new lstm_backward((Pointer)this).position(position + i); + return new lstm_backward((Pointer)this).offsetAddress(i); } /** Descriptor for an LSTM backward propagation primitive. */ @@ -779,7 +779,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_forward.java index b1e28d5113a..97cf38e514a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/lstm_forward.java @@ -26,7 +26,7 @@ public class lstm_forward extends primitive { return (lstm_forward)super.position(position); } @Override public lstm_forward getPointer(long i) { - return new lstm_forward((Pointer)this).position(position + i); + return new lstm_forward((Pointer)this).offsetAddress(i); } /** Descriptor for an LSTM forward propagation primitive. */ @@ -470,7 +470,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/matmul.java b/dnnl/src/gen/java/org/bytedeco/dnnl/matmul.java index 42525c5c1ff..269fc167f17 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/matmul.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/matmul.java @@ -38,7 +38,7 @@ public class matmul extends primitive { return (matmul)super.position(position); } @Override public matmul getPointer(long i) { - return new matmul((Pointer)this).position(position + i); + return new matmul((Pointer)this).offsetAddress(i); } /** Descriptor for a matmul primitive. */ @@ -87,7 +87,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java b/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java index c65e9bafd12..0ae891833fa 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/memory.java @@ -111,7 +111,7 @@ public class memory extends dnnl_memory_handle { return (memory)super.position(position); } @Override public memory getPointer(long i) { - return new memory((Pointer)this).position(position + i); + return new memory((Pointer)this).offsetAddress(i); } @@ -1065,7 +1065,7 @@ public enum format_tag { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } /** The underlying C API data structure. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_backward.java index ac2a8ebe444..b7d31b94f14 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_backward.java @@ -26,7 +26,7 @@ public class pooling_backward extends primitive { return (pooling_backward)super.position(position); } @Override public pooling_backward getPointer(long i) { - return new pooling_backward((Pointer)this).position(position + i); + return new pooling_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a pooling backward propagation primitive. */ @@ -123,7 +123,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_forward.java index 23d62b7ab0e..89c24b7e666 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_forward.java @@ -36,7 +36,7 @@ public class pooling_forward extends primitive { return (pooling_forward)super.position(position); } @Override public pooling_forward getPointer(long i) { - return new pooling_forward((Pointer)this).position(position + i); + return new pooling_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a pooling forward propagation primitive. */ @@ -136,7 +136,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_backward.java index b55de4063b7..b912ebb7c3d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_backward.java @@ -26,7 +26,7 @@ public class pooling_v2_backward extends primitive { return (pooling_v2_backward)super.position(position); } @Override public pooling_v2_backward getPointer(long i) { - return new pooling_v2_backward((Pointer)this).position(position + i); + return new pooling_v2_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a pooling backward propagation primitive. */ @@ -126,7 +126,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_forward.java index 427353a91f4..2552b6c139f 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/pooling_v2_forward.java @@ -36,7 +36,7 @@ public class pooling_v2_forward extends primitive { return (pooling_v2_forward)super.position(position); } @Override public pooling_v2_forward getPointer(long i) { - return new pooling_v2_forward((Pointer)this).position(position + i); + return new pooling_v2_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a pooling forward propagation primitive. */ @@ -150,7 +150,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/post_ops.java b/dnnl/src/gen/java/org/bytedeco/dnnl/post_ops.java index e8d8f919ac9..487f53fe9be 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/post_ops.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/post_ops.java @@ -45,7 +45,7 @@ public class post_ops extends dnnl_post_ops_handle { return (post_ops)super.position(position); } @Override public post_ops getPointer(long i) { - return new post_ops((Pointer)this).position(position + i); + return new post_ops((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_backward.java index 96f61acd042..18ab89cb930 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_backward.java @@ -26,7 +26,7 @@ public class prelu_backward extends primitive { return (prelu_backward)super.position(position); } @Override public prelu_backward getPointer(long i) { - return new prelu_backward((Pointer)this).position(position + i); + return new prelu_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a PReLU backward propagation primitive. */ @@ -67,7 +67,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_forward.java index c021633044d..f145bd3122a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/prelu_forward.java @@ -37,7 +37,7 @@ public class prelu_forward extends primitive { return (prelu_forward)super.position(position); } @Override public prelu_forward getPointer(long i) { - return new prelu_forward((Pointer)this).position(position + i); + return new prelu_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a PReLU forward propagation primitive. */ @@ -80,7 +80,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java index ed1905a57e2..733f7e1b6ec 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive.java @@ -48,7 +48,7 @@ public class primitive extends dnnl_primitive_handle { return (primitive)super.position(position); } @Override public primitive getPointer(long i) { - return new primitive((Pointer)this).position(position + i); + return new primitive((Pointer)this).offsetAddress(i); } /** Kinds of primitives supported by the library. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_attr.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_attr.java index 014bbee34fe..d77edfdd4ee 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_attr.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_attr.java @@ -41,7 +41,7 @@ public class primitive_attr extends dnnl_primitive_attr_handle { return (primitive_attr)super.position(position); } @Override public primitive_attr getPointer(long i) { - return new primitive_attr((Pointer)this).position(position + i); + return new primitive_attr((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc.java index fb6bc174bb4..59c7e88dc57 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc.java @@ -45,7 +45,7 @@ public class primitive_desc extends primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java index 6b985d4bcf9..97e78e76d30 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/primitive_desc_base.java @@ -43,7 +43,7 @@ public class primitive_desc_base extends dnnl_primitive_desc_handle { return (primitive_desc_base)super.position(position); } @Override public primitive_desc_base getPointer(long i) { - return new primitive_desc_base((Pointer)this).position(position + i); + return new primitive_desc_base((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/reduction.java b/dnnl/src/gen/java/org/bytedeco/dnnl/reduction.java index 41a8e80bf88..4e8f03e01d9 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/reduction.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/reduction.java @@ -37,7 +37,7 @@ public class reduction extends primitive { return (reduction)super.position(position); } @Override public reduction getPointer(long i) { - return new reduction((Pointer)this).position(position + i); + return new reduction((Pointer)this).offsetAddress(i); } /** Descriptor for reduction. */ @@ -52,7 +52,7 @@ public class reduction extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } public native @ByRef dnnl_reduction_desc_t data(); public native desc data(dnnl_reduction_desc_t setter); @@ -103,7 +103,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/reorder.java b/dnnl/src/gen/java/org/bytedeco/dnnl/reorder.java index a78b4767b5d..2c17d8c3a3d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/reorder.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/reorder.java @@ -37,7 +37,7 @@ public class reorder extends primitive { return (reorder)super.position(position); } @Override public reorder getPointer(long i) { - return new reorder((Pointer)this).position(position + i); + return new reorder((Pointer)this).offsetAddress(i); } /** Primitive descriptor for a reorder primitive. */ @@ -65,7 +65,7 @@ public static class primitive_desc extends primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_backward.java index 827cd620d53..d6430e56a84 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_backward.java @@ -26,7 +26,7 @@ public class resampling_backward extends primitive { return (resampling_backward)super.position(position); } @Override public resampling_backward getPointer(long i) { - return new resampling_backward((Pointer)this).position(position + i); + return new resampling_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a resampling backward propagation primitive. */ @@ -117,7 +117,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_forward.java index b30734d1cb7..b4a0c0aa75a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/resampling_forward.java @@ -38,7 +38,7 @@ public class resampling_forward extends primitive { return (resampling_forward)super.position(position); } @Override public resampling_forward getPointer(long i) { - return new resampling_forward((Pointer)this).position(position + i); + return new resampling_forward((Pointer)this).offsetAddress(i); } /** Descriptor for resampling forward propagation. */ @@ -195,7 +195,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/rnn_primitive_desc_base.java b/dnnl/src/gen/java/org/bytedeco/dnnl/rnn_primitive_desc_base.java index d7ca2608ac6..bcc6632e4b3 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/rnn_primitive_desc_base.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/rnn_primitive_desc_base.java @@ -63,7 +63,7 @@ private native void allocate(const_dnnl_op_desc_t desc, @Const primitive_attr at return (rnn_primitive_desc_base)super.position(position); } @Override public rnn_primitive_desc_base getPointer(long i) { - return new rnn_primitive_desc_base((Pointer)this).position(position + i); + return new rnn_primitive_desc_base((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_backward.java index f6751b96dde..fd29ffa07cc 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_backward.java @@ -26,7 +26,7 @@ public class shuffle_backward extends primitive { return (shuffle_backward)super.position(position); } @Override public shuffle_backward getPointer(long i) { - return new shuffle_backward((Pointer)this).position(position + i); + return new shuffle_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a shuffle primitive backward propagation @@ -63,7 +63,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_forward.java index 59533fb8857..a92818c5594 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/shuffle_forward.java @@ -36,7 +36,7 @@ public class shuffle_forward extends primitive { return (shuffle_forward)super.position(position); } @Override public shuffle_forward getPointer(long i) { - return new shuffle_forward((Pointer)this).position(position + i); + return new shuffle_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a shuffle forward propagation primitive. */ @@ -80,7 +80,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_backward.java index d9c06a33e13..5f512d79280 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_backward.java @@ -26,7 +26,7 @@ public class softmax_backward extends primitive { return (softmax_backward)super.position(position); } @Override public softmax_backward getPointer(long i) { - return new softmax_backward((Pointer)this).position(position + i); + return new softmax_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a softmax backward propagation primitive. */ @@ -41,7 +41,7 @@ public class softmax_backward extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } public native @ByRef dnnl_softmax_desc_t data(); public native desc data(dnnl_softmax_desc_t setter); @@ -77,7 +77,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_forward.java index 9a0172918be..e2a98449645 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/softmax_forward.java @@ -36,7 +36,7 @@ public class softmax_forward extends primitive { return (softmax_forward)super.position(position); } @Override public softmax_forward getPointer(long i) { - return new softmax_forward((Pointer)this).position(position + i); + return new softmax_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a softmax forward propagation primitive. */ @@ -51,7 +51,7 @@ public class softmax_forward extends primitive { return (desc)super.position(position); } @Override public desc getPointer(long i) { - return new desc((Pointer)this).position(position + i); + return new desc((Pointer)this).offsetAddress(i); } public native @ByRef dnnl_softmax_desc_t data(); public native desc data(dnnl_softmax_desc_t setter); @@ -92,7 +92,7 @@ public static class primitive_desc extends org.bytedeco.dnnl.primitive_desc { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/stream.java b/dnnl/src/gen/java/org/bytedeco/dnnl/stream.java index f65b0052d02..c3e085037de 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/stream.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/stream.java @@ -39,7 +39,7 @@ public class stream extends dnnl_stream_handle { return (stream)super.position(position); } @Override public stream getPointer(long i) { - return new stream((Pointer)this).position(position + i); + return new stream((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java b/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java index 4d9227ebb4b..6fad018831a 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/sum.java @@ -36,7 +36,7 @@ public class sum extends primitive { return (sum)super.position(position); } @Override public sum getPointer(long i) { - return new sum((Pointer)this).position(position + i); + return new sum((Pointer)this).offsetAddress(i); } /** Primitive descriptor for a sum primitive. */ @@ -64,7 +64,7 @@ public static class primitive_desc extends primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_backward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_backward.java index 34c87977d2d..16094c2e2e9 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_backward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_backward.java @@ -26,7 +26,7 @@ public class vanilla_rnn_backward extends primitive { return (vanilla_rnn_backward)super.position(position); } @Override public vanilla_rnn_backward getPointer(long i) { - return new vanilla_rnn_backward((Pointer)this).position(position + i); + return new vanilla_rnn_backward((Pointer)this).offsetAddress(i); } /** Descriptor for a vanilla RNN backward propagation primitive. */ @@ -236,7 +236,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_forward.java b/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_forward.java index fdc816927c5..ab997503d89 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_forward.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/vanilla_rnn_forward.java @@ -26,7 +26,7 @@ public class vanilla_rnn_forward extends primitive { return (vanilla_rnn_forward)super.position(position); } @Override public vanilla_rnn_forward getPointer(long i) { - return new vanilla_rnn_forward((Pointer)this).position(position + i); + return new vanilla_rnn_forward((Pointer)this).offsetAddress(i); } /** Descriptor for a vanilla RNN forward propagation primitive. */ @@ -168,7 +168,7 @@ public static class primitive_desc extends rnn_primitive_desc_base { return (primitive_desc)super.position(position); } @Override public primitive_desc getPointer(long i) { - return new primitive_desc((Pointer)this).position(position + i); + return new primitive_desc((Pointer)this).offsetAddress(i); } /** Default constructor. Produces an empty object. */ diff --git a/flandmark/pom.xml b/flandmark/pom.xml index 72e3cdc4bfd..04225517bdc 100644 --- a/flandmark/pom.xml +++ b/flandmark/pom.xml @@ -41,7 +41,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -51,7 +51,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index dcbc704ec98..138ddccd97e 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/gsl/pom.xml b/gsl/pom.xml index b97fe58c5e1..d603701687f 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -44,12 +44,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/gym/platform/pom.xml b/gym/platform/pom.xml index dd53760dc8b..b02622981bc 100644 --- a/gym/platform/pom.xml +++ b/gym/platform/pom.xml @@ -28,7 +28,7 @@ org.bytedeco scipy-platform - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} ${project.groupId} diff --git a/gym/pom.xml b/gym/pom.xml index 6d6b78fc355..ba14cf6ab91 100644 --- a/gym/pom.xml +++ b/gym/pom.xml @@ -23,7 +23,7 @@ org.bytedeco scipy - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} org.bytedeco @@ -64,12 +64,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} org.bytedeco @@ -79,29 +79,29 @@ org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} org.bytedeco scipy - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${javacpp.platform} org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} ${javacpp.platform} @@ -113,7 +113,7 @@ org.bytedeco scipy - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} ${javacpp.platform} diff --git a/mxnet/README.md b/mxnet/README.md index dd1868e82a8..f7702206d19 100644 --- a/mxnet/README.md +++ b/mxnet/README.md @@ -69,7 +69,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/mxnet/platform/gpu/pom.xml b/mxnet/platform/gpu/pom.xml index 047238e50e8..d170f1d29a5 100644 --- a/mxnet/platform/gpu/pom.xml +++ b/mxnet/platform/gpu/pom.xml @@ -29,7 +29,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/mxnet/platform/pom.xml b/mxnet/platform/pom.xml index e2d75f299c5..76c397044bb 100644 --- a/mxnet/platform/pom.xml +++ b/mxnet/platform/pom.xml @@ -28,7 +28,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/mxnet/pom.xml b/mxnet/pom.xml index 093cd17ea8a..b1a53cb2840 100644 --- a/mxnet/pom.xml +++ b/mxnet/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -79,7 +79,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -90,7 +90,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} @@ -304,7 +304,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} linux-x86_64 diff --git a/mxnet/samples/pom.xml b/mxnet/samples/pom.xml index 5e10c25d7eb..93decb069da 100644 --- a/mxnet/samples/pom.xml +++ b/mxnet/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/numpy/README.md b/numpy/README.md index da7e00844f2..8a1788cd15a 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 1.20.2 http://www.numpy.org/ + * NumPy 1.20.3 http://www.numpy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.20.2-1.5.6-SNAPSHOT + 1.20.3-1.5.6-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index bd9393f4291..b260ed27f7f 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=1.20.2 +NUMPY_VERSION=1.20.3 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index 0c56c1e0f14..9dbc7a881eb 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} JavaCPP Presets Platform for NumPy @@ -23,12 +23,12 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco cpython-platform - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${project.groupId} diff --git a/numpy/pom.xml b/numpy/pom.xml index e25b9cada1c..ec6377ae21e 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,19 +11,19 @@ org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} JavaCPP Presets for NumPy org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} org.bytedeco @@ -46,23 +46,23 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${javacpp.platform} @@ -171,7 +171,7 @@ org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${os.name}-${os.arch} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index f2cf4234adb..0b31600f531 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.20.2-1.5.6-SNAPSHOT + 1.20.3-1.5.6-SNAPSHOT diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData.java index e16e98c900b..bff91483509 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class NpyAuxData extends PyObject { return (NpyAuxData)super.position(position); } @Override public NpyAuxData getPointer(long i) { - return new NpyAuxData((Pointer)this).position(position + i); + return new NpyAuxData((Pointer)this).offsetAddress(i); } public native @Name("free") NpyAuxData_FreeFunc _free(); public native NpyAuxData _free(NpyAuxData_FreeFunc setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_CloneFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_CloneFunc.java index dec39921635..3a7e1f52ba3 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_CloneFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_CloneFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_FreeFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_FreeFunc.java index 1bdb4bc8a73..37843f7d61c 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_FreeFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyAuxData_FreeFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter.java index c6f29da7d98..f80c57d0836 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_GetMultiIndexFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_GetMultiIndexFunc.java index 69e108fdb0e..0706ea7619d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_GetMultiIndexFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_GetMultiIndexFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_IterNextFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_IterNextFunc.java index 90321e8a84b..9d3bda97988 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_IterNextFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/NpyIter_IterNextFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java index c702eac426b..9f334c3ed11 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayFlagsObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -45,7 +45,7 @@ public class PyArrayFlagsObject extends Pointer { return (PyArrayFlagsObject)super.position(position); } @Override public PyArrayFlagsObject getPointer(long i) { - return new PyArrayFlagsObject((Pointer)this).position(position + i); + return new PyArrayFlagsObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayFlagsObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayInterface.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayInterface.java index 060f6cb0557..3a23e6737f4 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayInterface.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayInterface.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -36,7 +36,7 @@ public class PyArrayInterface extends Pointer { return (PyArrayInterface)super.position(position); } @Override public PyArrayInterface getPointer(long i) { - return new PyArrayInterface((Pointer)this).position(position + i); + return new PyArrayInterface((Pointer)this).offsetAddress(i); } public native int two(); public native PyArrayInterface two(int setter); /* diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayIterObject.java index e8e2d2cd815..7fe47a7efcf 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayIterObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArrayIterObject extends PyObject { return (PyArrayIterObject)super.position(position); } @Override public PyArrayIterObject getPointer(long i) { - return new PyArrayIterObject((Pointer)this).position(position + i); + return new PyArrayIterObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayIterObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java index 08d57bd0ec9..2503a914e43 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMapIterObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -36,7 +36,7 @@ public class PyArrayMapIterObject extends Pointer { return (PyArrayMapIterObject)super.position(position); } @Override public PyArrayMapIterObject getPointer(long i) { - return new PyArrayMapIterObject((Pointer)this).position(position + i); + return new PyArrayMapIterObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayMapIterObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java index 969f4c8305f..eba3a5a5ca7 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -36,7 +36,7 @@ public class PyArrayMultiIterObject extends Pointer { return (PyArrayMultiIterObject)super.position(position); } @Override public PyArrayMultiIterObject getPointer(long i) { - return new PyArrayMultiIterObject((Pointer)this).position(position + i); + return new PyArrayMultiIterObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayMultiIterObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayNeighborhoodIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayNeighborhoodIterObject.java index f1cbcc62d6e..6eea8c384cc 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayNeighborhoodIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayNeighborhoodIterObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArrayNeighborhoodIterObject extends Pointer { return (PyArrayNeighborhoodIterObject)super.position(position); } @Override public PyArrayNeighborhoodIterObject getPointer(long i) { - return new PyArrayNeighborhoodIterObject((Pointer)this).position(position + i); + return new PyArrayNeighborhoodIterObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayNeighborhoodIterObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java index bd403435f02..7eb17fb09ca 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -41,7 +41,7 @@ public class PyArrayObject extends PyObject { return (PyArrayObject)super.position(position); } @Override public PyArrayObject getPointer(long i) { - return new PyArrayObject((Pointer)this).position(position + i); + return new PyArrayObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArrayObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgFunc.java index a51bd6a5cb5..ce46ed3d873 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java index dba9f0979e4..7d0f9c7cf75 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgPartitionFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgSortFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgSortFunc.java index d6ee7832ab4..29d1a063d35 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgSortFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArgSortFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java index 544e7dab7b1..1d41387fe7f 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrFuncs.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_ArrFuncs extends Pointer { return (PyArray_ArrFuncs)super.position(position); } @Override public PyArray_ArrFuncs getPointer(long i) { - return new PyArray_ArrFuncs((Pointer)this).position(position + i); + return new PyArray_ArrFuncs((Pointer)this).offsetAddress(i); } /* diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java index 550097fdf00..8125e40e964 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ArrayDescr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_ArrayDescr extends Pointer { return (PyArray_ArrayDescr)super.position(position); } @Override public PyArray_ArrayDescr getPointer(long i) { - return new PyArray_ArrayDescr((Pointer)this).position(position + i); + return new PyArray_ArrayDescr((Pointer)this).offsetAddress(i); } public native PyArray_Descr base(); public native PyArray_ArrayDescr base(PyArray_Descr setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java index fa9c64bf8e2..fa67c8ed666 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Chunk.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -32,7 +32,7 @@ public class PyArray_Chunk extends Pointer { return (PyArray_Chunk)super.position(position); } @Override public PyArray_Chunk getPointer(long i) { - return new PyArray_Chunk((Pointer)this).position(position + i); + return new PyArray_Chunk((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArray_Chunk ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CompareFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CompareFunc.java index 1c1c826dccb..15d8c9016e6 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CompareFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CompareFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapFunc.java index 2b2f88c568b..3573647c7e2 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapNFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapNFunc.java index 79fd0026183..945f4a45c29 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapNFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_CopySwapNFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeDTypeMetaData.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeDTypeMetaData.java index 400e071472c..12a0fd3d93e 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeDTypeMetaData.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeDTypeMetaData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_DatetimeDTypeMetaData extends Pointer { return (PyArray_DatetimeDTypeMetaData)super.position(position); } @Override public PyArray_DatetimeDTypeMetaData getPointer(long i) { - return new PyArray_DatetimeDTypeMetaData((Pointer)this).position(position + i); + return new PyArray_DatetimeDTypeMetaData((Pointer)this).offsetAddress(i); } public native @ByRef NpyAuxData base(); public native PyArray_DatetimeDTypeMetaData base(NpyAuxData setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeMetaData.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeMetaData.java index 5762084437c..d72a125f7d1 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeMetaData.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DatetimeMetaData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_DatetimeMetaData extends Pointer { return (PyArray_DatetimeMetaData)super.position(position); } @Override public PyArray_DatetimeMetaData getPointer(long i) { - return new PyArray_DatetimeMetaData((Pointer)this).position(position + i); + return new PyArray_DatetimeMetaData((Pointer)this).offsetAddress(i); } public native @Cast("NPY_DATETIMEUNIT") int base(); public native PyArray_DatetimeMetaData base(int setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java index 456a032e6b4..6f35e57055b 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Descr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_Descr extends Pointer { return (PyArray_Descr)super.position(position); } @Override public PyArray_Descr getPointer(long i) { - return new PyArray_Descr((Pointer)this).position(position + i); + return new PyArray_Descr((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyArray_Descr ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Dims.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Dims.java index d1a1725c4bc..8a158051595 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Dims.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_Dims.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyArray_Dims extends Pointer { return (PyArray_Dims)super.position(position); } @Override public PyArray_Dims getPointer(long i) { - return new PyArray_Dims((Pointer)this).position(position + i); + return new PyArray_Dims((Pointer)this).offsetAddress(i); } public native @Cast("npy_intp*") SizeTPointer ptr(); public native PyArray_Dims ptr(SizeTPointer setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DotFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DotFunc.java index 9991d1e0353..9324b0d3bb3 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DotFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_DotFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java index 29d4c14d957..0e7ea12ac89 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastClipFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java index f2579983116..b1b047bc083 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastPutmaskFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java index eb5117585db..6389ca05fca 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FastTakeFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillFunc.java index 809d2247ab9..d9639d6dcc6 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillWithScalarFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillWithScalarFunc.java index a857e47f742..21b660de36d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillWithScalarFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FillWithScalarFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FinalizeFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FinalizeFunc.java index 8f1efde4d12..8c48474e2bd 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FinalizeFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FinalizeFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FromStrFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FromStrFunc.java index 8d497871be9..c63618f5790 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FromStrFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_FromStrFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_GetItemFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_GetItemFunc.java index a8e513c00da..ea9e9eaf294 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_GetItemFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_GetItemFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_NonzeroFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_NonzeroFunc.java index ef3dd697507..6556c97cef0 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_NonzeroFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_NonzeroFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java index 7407161a4e1..2f1818e2933 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_PartitionFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScalarKindFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScalarKindFunc.java index 4a74fc09748..5d07297b3b3 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScalarKindFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScalarKindFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScanFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScanFunc.java index 3e210654c8e..ac3ec011eed 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScanFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_ScanFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SetItemFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SetItemFunc.java index b47d4aac71f..48960765800 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SetItemFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SetItemFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SortFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SortFunc.java index ae041b7f66d..6a3d8e7687e 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SortFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_SortFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_VectorUnaryFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_VectorUnaryFunc.java index 01416af253f..45b3295299d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArray_VectorUnaryFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArray_VectorUnaryFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyBoolScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyBoolScalarObject.java index f6d301ae217..33266c034b1 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyBoolScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyBoolScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyBoolScalarObject extends Pointer { return (PyBoolScalarObject)super.position(position); } @Override public PyBoolScalarObject getPointer(long i) { - return new PyBoolScalarObject((Pointer)this).position(position + i); + return new PyBoolScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyBoolScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyByteScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyByteScalarObject.java index 3d1659a7529..fa075ca8f38 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyByteScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyByteScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -32,7 +32,7 @@ public class PyByteScalarObject extends Pointer { return (PyByteScalarObject)super.position(position); } @Override public PyByteScalarObject getPointer(long i) { - return new PyByteScalarObject((Pointer)this).position(position + i); + return new PyByteScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyByteScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyCDoubleScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyCDoubleScalarObject.java index 9544a7ea575..91c9172aada 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyCDoubleScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyCDoubleScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyCDoubleScalarObject extends Pointer { return (PyCDoubleScalarObject)super.position(position); } @Override public PyCDoubleScalarObject getPointer(long i) { - return new PyCDoubleScalarObject((Pointer)this).position(position + i); + return new PyCDoubleScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCDoubleScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyCFloatScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyCFloatScalarObject.java index 5f8b9284752..546b0f11581 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyCFloatScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyCFloatScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyCFloatScalarObject extends Pointer { return (PyCFloatScalarObject)super.position(position); } @Override public PyCFloatScalarObject getPointer(long i) { - return new PyCFloatScalarObject((Pointer)this).position(position + i); + return new PyCFloatScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCFloatScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyCLongDoubleScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyCLongDoubleScalarObject.java index 24569374a8e..24114085e39 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyCLongDoubleScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyCLongDoubleScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyCLongDoubleScalarObject extends Pointer { return (PyCLongDoubleScalarObject)super.position(position); } @Override public PyCLongDoubleScalarObject getPointer(long i) { - return new PyCLongDoubleScalarObject((Pointer)this).position(position + i); + return new PyCLongDoubleScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyCLongDoubleScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java index 660f6efd941..2fa31658fbf 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyDataMem_EventHookFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyDatetimeScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyDatetimeScalarObject.java index ad88ef25c7c..7db63ef071b 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyDatetimeScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyDatetimeScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyDatetimeScalarObject extends Pointer { return (PyDatetimeScalarObject)super.position(position); } @Override public PyDatetimeScalarObject getPointer(long i) { - return new PyDatetimeScalarObject((Pointer)this).position(position + i); + return new PyDatetimeScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDatetimeScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyDoubleScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyDoubleScalarObject.java index f061313ab08..2b22a0447c5 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyDoubleScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyDoubleScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyDoubleScalarObject extends Pointer { return (PyDoubleScalarObject)super.position(position); } @Override public PyDoubleScalarObject getPointer(long i) { - return new PyDoubleScalarObject((Pointer)this).position(position + i); + return new PyDoubleScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyDoubleScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyFloatScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyFloatScalarObject.java index aa615c8e320..766af152946 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyFloatScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyFloatScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyFloatScalarObject extends Pointer { return (PyFloatScalarObject)super.position(position); } @Override public PyFloatScalarObject getPointer(long i) { - return new PyFloatScalarObject((Pointer)this).position(position + i); + return new PyFloatScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyFloatScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyHalfScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyHalfScalarObject.java index 3399ee55493..80301203fbe 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyHalfScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyHalfScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyHalfScalarObject extends Pointer { return (PyHalfScalarObject)super.position(position); } @Override public PyHalfScalarObject getPointer(long i) { - return new PyHalfScalarObject((Pointer)this).position(position + i); + return new PyHalfScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyHalfScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyIntScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyIntScalarObject.java index adabff69519..8a72890a3ae 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyIntScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyIntScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyIntScalarObject extends Pointer { return (PyIntScalarObject)super.position(position); } @Override public PyIntScalarObject getPointer(long i) { - return new PyIntScalarObject((Pointer)this).position(position + i); + return new PyIntScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyIntScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyLongDoubleScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyLongDoubleScalarObject.java index 71e08ef5549..46a047a0254 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyLongDoubleScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyLongDoubleScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyLongDoubleScalarObject extends Pointer { return (PyLongDoubleScalarObject)super.position(position); } @Override public PyLongDoubleScalarObject getPointer(long i) { - return new PyLongDoubleScalarObject((Pointer)this).position(position + i); + return new PyLongDoubleScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyLongDoubleScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyLongLongScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyLongLongScalarObject.java index da97af1cc06..ced6f9a238a 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyLongLongScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyLongLongScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyLongLongScalarObject extends Pointer { return (PyLongLongScalarObject)super.position(position); } @Override public PyLongLongScalarObject getPointer(long i) { - return new PyLongLongScalarObject((Pointer)this).position(position + i); + return new PyLongLongScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyLongLongScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyLongScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyLongScalarObject.java index 2cf85b8d8a9..18e39496a8d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyLongScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyLongScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyLongScalarObject extends Pointer { return (PyLongScalarObject)super.position(position); } @Override public PyLongScalarObject getPointer(long i) { - return new PyLongScalarObject((Pointer)this).position(position + i); + return new PyLongScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyLongScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyObjectScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyObjectScalarObject.java index 1e8c320e1b5..8a83b9e79f3 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyObjectScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyObjectScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyObjectScalarObject extends Pointer { return (PyObjectScalarObject)super.position(position); } @Override public PyObjectScalarObject getPointer(long i) { - return new PyObjectScalarObject((Pointer)this).position(position + i); + return new PyObjectScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyObjectScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyScalarObject.java index ef35dad6a08..20c0e456603 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyScalarObject extends Pointer { return (PyScalarObject)super.position(position); } @Override public PyScalarObject getPointer(long i) { - return new PyScalarObject((Pointer)this).position(position + i); + return new PyScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyShortScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyShortScalarObject.java index e92d4dce33f..db6f508d70b 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyShortScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyShortScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyShortScalarObject extends Pointer { return (PyShortScalarObject)super.position(position); } @Override public PyShortScalarObject getPointer(long i) { - return new PyShortScalarObject((Pointer)this).position(position + i); + return new PyShortScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyShortScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyTimedeltaScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyTimedeltaScalarObject.java index bc69276b130..e4bcae664d5 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyTimedeltaScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyTimedeltaScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyTimedeltaScalarObject extends Pointer { return (PyTimedeltaScalarObject)super.position(position); } @Override public PyTimedeltaScalarObject getPointer(long i) { - return new PyTimedeltaScalarObject((Pointer)this).position(position + i); + return new PyTimedeltaScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyTimedeltaScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUByteScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUByteScalarObject.java index f29907e6cf3..e684ccd68d8 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUByteScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUByteScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyUByteScalarObject extends Pointer { return (PyUByteScalarObject)super.position(position); } @Override public PyUByteScalarObject getPointer(long i) { - return new PyUByteScalarObject((Pointer)this).position(position + i); + return new PyUByteScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyUByteScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncGenericFunction.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncGenericFunction.java index b24999de0ea..8fc74f87167 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncGenericFunction.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncGenericFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java index a8955cab0e6..cc8657c24b5 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class PyUFuncObject extends Pointer { return (PyUFuncObject)super.position(position); } @Override public PyUFuncObject getPointer(long i) { - return new PyUFuncObject((Pointer)this).position(position + i); + return new PyUFuncObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyUFuncObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java index c84b0c9d34a..7e29f21b890 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_LegacyInnerLoopSelectionFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_Loop1d.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_Loop1d.java index 64818140613..e0e9db8d43b 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_Loop1d.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_Loop1d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -33,7 +33,7 @@ public class PyUFunc_Loop1d extends Pointer { return (PyUFunc_Loop1d)super.position(position); } @Override public PyUFunc_Loop1d getPointer(long i) { - return new PyUFunc_Loop1d((Pointer)this).position(position + i); + return new PyUFunc_Loop1d((Pointer)this).offsetAddress(i); } public native PyUFuncGenericFunction func(); public native PyUFunc_Loop1d func(PyUFuncGenericFunction setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedInnerLoopSelectionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedInnerLoopSelectionFunc.java index b712da85bee..266327a3857 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedInnerLoopSelectionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedInnerLoopSelectionFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedStridedInnerLoopFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedStridedInnerLoopFunc.java index bf22a35b663..fdaecdcb81a 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedStridedInnerLoopFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_MaskedStridedInnerLoopFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_PyFuncData.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_PyFuncData.java index 0f11a39547c..5b0cb5dc781 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_PyFuncData.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_PyFuncData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyUFunc_PyFuncData extends Pointer { return (PyUFunc_PyFuncData)super.position(position); } @Override public PyUFunc_PyFuncData getPointer(long i) { - return new PyUFunc_PyFuncData((Pointer)this).position(position + i); + return new PyUFunc_PyFuncData((Pointer)this).offsetAddress(i); } public native int nin(); public native PyUFunc_PyFuncData nin(int setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_TypeResolutionFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_TypeResolutionFunc.java index 72c8a4160fc..2f2b151a29e 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_TypeResolutionFunc.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_TypeResolutionFunc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUIntScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUIntScalarObject.java index 795548166e2..1e42f24b28c 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUIntScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUIntScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyUIntScalarObject extends Pointer { return (PyUIntScalarObject)super.position(position); } @Override public PyUIntScalarObject getPointer(long i) { - return new PyUIntScalarObject((Pointer)this).position(position + i); + return new PyUIntScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyUIntScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyULongLongScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyULongLongScalarObject.java index 11633ec393d..09a46fddd05 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyULongLongScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyULongLongScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyULongLongScalarObject extends Pointer { return (PyULongLongScalarObject)super.position(position); } @Override public PyULongLongScalarObject getPointer(long i) { - return new PyULongLongScalarObject((Pointer)this).position(position + i); + return new PyULongLongScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyULongLongScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyULongScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyULongScalarObject.java index 46983f919a4..49896334629 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyULongScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyULongScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyULongScalarObject extends Pointer { return (PyULongScalarObject)super.position(position); } @Override public PyULongScalarObject getPointer(long i) { - return new PyULongScalarObject((Pointer)this).position(position + i); + return new PyULongScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyULongScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUShortScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUShortScalarObject.java index c6ad7ee039b..e193de9d8e6 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUShortScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUShortScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyUShortScalarObject extends Pointer { return (PyUShortScalarObject)super.position(position); } @Override public PyUShortScalarObject getPointer(long i) { - return new PyUShortScalarObject((Pointer)this).position(position + i); + return new PyUShortScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyObject ob_base(); public native PyUShortScalarObject ob_base(PyObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java index 83a49ec333d..cba492ee57e 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUnicodeScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -29,7 +29,7 @@ public class PyUnicodeScalarObject extends Pointer { return (PyUnicodeScalarObject)super.position(position); } @Override public PyUnicodeScalarObject getPointer(long i) { - return new PyUnicodeScalarObject((Pointer)this).position(position + i); + return new PyUnicodeScalarObject((Pointer)this).offsetAddress(i); } /* note that the PyObject_HEAD macro lives right here */ diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java index 35fee9b3af1..57da1d82d38 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyVoidScalarObject.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class PyVoidScalarObject extends Pointer { return (PyVoidScalarObject)super.position(position); } @Override public PyVoidScalarObject getPointer(long i) { - return new PyVoidScalarObject((Pointer)this).position(position + i); + return new PyVoidScalarObject((Pointer)this).offsetAddress(i); } public native @ByRef PyVarObject ob_base(); public native PyVoidScalarObject ob_base(PyVarObject setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_Descr.java b/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_Descr.java index 52344256987..1fbd00a3b73 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_Descr.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/_PyArray_Descr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java index 2314c64b10e..7b802bc94cb 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy.global; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java index bb44583e960..7f1c09edd6a 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_cdouble.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class npy_cdouble extends Pointer { return (npy_cdouble)super.position(position); } @Override public npy_cdouble getPointer(long i) { - return new npy_cdouble((Pointer)this).position(position + i); + return new npy_cdouble((Pointer)this).offsetAddress(i); } public native double real(); public native npy_cdouble real(double setter); public native double imag(); public native npy_cdouble imag(double setter); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java index a7418ca8a08..ab5c6126352 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_cfloat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class npy_cfloat extends Pointer { return (npy_cfloat)super.position(position); } @Override public npy_cfloat getPointer(long i) { - return new npy_cfloat((Pointer)this).position(position + i); + return new npy_cfloat((Pointer)this).offsetAddress(i); } public native float real(); public native npy_cfloat real(float setter); public native float imag(); public native npy_cfloat imag(float setter); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java index e2a5a6008b5..ef488496895 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_clongdouble.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -30,7 +30,7 @@ public class npy_clongdouble extends Pointer { return (npy_clongdouble)super.position(position); } @Override public npy_clongdouble getPointer(long i) { - return new npy_clongdouble((Pointer)this).position(position + i); + return new npy_clongdouble((Pointer)this).offsetAddress(i); } public native @Cast("npy_longdouble") double real(); public native npy_clongdouble real(double setter); public native @Cast("npy_longdouble") double imag(); public native npy_clongdouble imag(double setter); } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_datetimestruct.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_datetimestruct.java index 35bf7c1b26b..bdc3e7d34b4 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_datetimestruct.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_datetimestruct.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -34,7 +34,7 @@ public class npy_datetimestruct extends Pointer { return (npy_datetimestruct)super.position(position); } @Override public npy_datetimestruct getPointer(long i) { - return new npy_datetimestruct((Pointer)this).position(position + i); + return new npy_datetimestruct((Pointer)this).offsetAddress(i); } public native @Cast("npy_int64") long year(); public native npy_datetimestruct year(long setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_iter_get_dataptr_t.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_iter_get_dataptr_t.java index b4c14b6a3fa..8cf59a6c90d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_iter_get_dataptr_t.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_iter_get_dataptr_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_stride_sort_item.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_stride_sort_item.java index c632e54c825..d5248098c26 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_stride_sort_item.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_stride_sort_item.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -34,7 +34,7 @@ public class npy_stride_sort_item extends Pointer { return (npy_stride_sort_item)super.position(position); } @Override public npy_stride_sort_item getPointer(long i) { - return new npy_stride_sort_item((Pointer)this).position(position + i); + return new npy_stride_sort_item((Pointer)this).offsetAddress(i); } public native @Cast("npy_intp") long perm(); public native npy_stride_sort_item perm(long setter); diff --git a/numpy/src/gen/java/org/bytedeco/numpy/npy_timedeltastruct.java b/numpy/src/gen/java/org/bytedeco/numpy/npy_timedeltastruct.java index 09e855b36c1..10d3e084ce7 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/npy_timedeltastruct.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/npy_timedeltastruct.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.numpy; @@ -31,7 +31,7 @@ public class npy_timedeltastruct extends Pointer { return (npy_timedeltastruct)super.position(position); } @Override public npy_timedeltastruct getPointer(long i) { - return new npy_timedeltastruct((Pointer)this).position(position + i); + return new npy_timedeltastruct((Pointer)this).offsetAddress(i); } public native @Cast("npy_int64") long day(); public native npy_timedeltastruct day(long setter); diff --git a/nvcodec/README.md b/nvcodec/README.md index b8f18c567fb..e2c4285535a 100644 --- a/nvcodec/README.md +++ b/nvcodec/README.md @@ -62,7 +62,7 @@ You can find more encoder and decoder samples in the [`samples`](samples) subdir org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/nvcodec/platform/pom.xml b/nvcodec/platform/pom.xml index 4df2ed76cdf..2d4a41ca121 100644 --- a/nvcodec/platform/pom.xml +++ b/nvcodec/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco cuda-platform - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} ${project.groupId} diff --git a/nvcodec/pom.xml b/nvcodec/pom.xml index 1bab6e3fbb2..36726020677 100644 --- a/nvcodec/pom.xml +++ b/nvcodec/pom.xml @@ -18,7 +18,7 @@ org.bytedeco cuda - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} org.bytedeco @@ -44,7 +44,7 @@ org.bytedeco cuda - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} diff --git a/nvcodec/samples/pom.xml b/nvcodec/samples/pom.xml index a3e2f027848..2a418624831 100644 --- a/nvcodec/samples/pom.xml +++ b/nvcodec/samples/pom.xml @@ -23,7 +23,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/nvcodec/samples/simple/pom.xml b/nvcodec/samples/simple/pom.xml index 57d3da2aa6e..5988ccb991b 100644 --- a/nvcodec/samples/simple/pom.xml +++ b/nvcodec/samples/simple/pom.xml @@ -19,7 +19,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/onnxruntime/README.md b/onnxruntime/README.md index 0d76d41dc21..c014de19f58 100644 --- a/onnxruntime/README.md +++ b/onnxruntime/README.md @@ -60,7 +60,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 5ee8c942c1e..3f21b68781c 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -72,7 +72,7 @@ patch -p1 < ../../../onnxruntime.patch sedinplace "s/default='Visual Studio 15 2017'/default='Ninja'/g" tools/ci_build/build.py sedinplace 's:/Yucuda_pch.h /FIcuda_pch.h::g' cmake/onnxruntime_providers.cmake sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers.cmake -sedinplace 's/DNNL_TAG v1../DNNL_TAG v2.2.1/g' cmake/external/dnnl.cmake +sedinplace 's/DNNL_TAG v1../DNNL_TAG v2.2.2/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.1.dylib/DNNL_SHARED_LIB libdnnl.2.dylib/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.so.1/DNNL_SHARED_LIB libdnnl.so.2/g' cmake/external/dnnl.cmake sedinplace 's/ CMAKE_ARGS/CMAKE_ARGS -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF/g' cmake/external/dnnl.cmake diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index ad7e12f848b..5383e34aa65 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index 0fe2c935fee..2ac58636e48 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index 4deda6c8136..7dc46de2b78 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -22,7 +22,7 @@ org.bytedeco dnnl - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} org.bytedeco @@ -49,7 +49,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index 8476d14ee3a..f160375b078 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/openblas/OpenBLAS-macosx.patch b/openblas/OpenBLAS-macosx.patch index 64c36c785a0..149feb86119 100644 --- a/openblas/OpenBLAS-macosx.patch +++ b/openblas/OpenBLAS-macosx.patch @@ -1,7 +1,7 @@ -diff -ruN OpenBLAS-0.3.9/exports/Makefile OpenBLAS-0.3.9-macosx/exports/Makefile ---- OpenBLAS-0.3.9/exports/Makefile 2020-03-02 08:10:20.000000000 +0900 -+++ OpenBLAS-0.3.9-macosx/exports/Makefile 2020-03-10 16:18:55.098795543 +0900 -@@ -116,12 +116,7 @@ +diff -ruN OpenBLAS-0.3.15/exports/Makefile OpenBLAS-0.3.15-macosx/exports/Makefile +--- OpenBLAS-0.3.15/exports/Makefile 2021-05-03 06:50:22.000000000 +0900 ++++ OpenBLAS-0.3.15-macosx/exports/Makefile 2021-05-11 19:11:48.316710867 +0900 +@@ -136,16 +136,7 @@ $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed $(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def endif @@ -9,16 +9,20 @@ diff -ruN OpenBLAS-0.3.9/exports/Makefile OpenBLAS-0.3.9-macosx/exports/Makefile -#only build without Fortran - $(CC) $(CFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) -else +-ifeq ($(F_COMPILER), INTEL) +- $(FC) $(FFLAGS) $(LDFLAGS) -all-load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def +-else - $(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) -endif +-endif + $(CC) $(CFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def dllinit.$(SUFFIX) : dllinit.c $(CC) $(CFLAGS) -c -o $(@F) -s $< -diff -ruN OpenBLAS-0.3.9/Makefile.install OpenBLAS-0.3.9-macosx/Makefile.install ---- OpenBLAS-0.3.9/Makefile.install 2020-03-02 08:10:20.000000000 +0900 -+++ OpenBLAS-0.3.9-macosx/Makefile.install 2020-03-10 16:22:43.003900956 +0900 -@@ -82,7 +82,7 @@ +diff -ruN OpenBLAS-0.3.15/Makefile.install OpenBLAS-0.3.15-macosx/Makefile.install +--- OpenBLAS-0.3.15/Makefile.install 2021-05-03 06:50:22.000000000 +0900 ++++ OpenBLAS-0.3.15-macosx/Makefile.install 2021-05-11 16:57:11.009523603 +0900 +@@ -105,7 +105,7 @@ endif ifeq ($(OSNAME), Darwin) @-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" diff --git a/openblas/README.md b/openblas/README.md index 3d38fa21cda..35ef897d45a 100644 --- a/openblas/README.md +++ b/openblas/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenBLAS 0.3.14 http://www.openblas.net/ + * OpenBLAS 0.3.15 http://www.openblas.net/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco openblas-platform - 0.3.14-1.5.6-SNAPSHOT + 0.3.15-1.5.6-SNAPSHOT diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh index c4cc1700235..d512c2ed948 100755 --- a/openblas/cppbuild.sh +++ b/openblas/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENBLAS_VERSION=0.3.14 +OPENBLAS_VERSION=0.3.15 download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml index f634c33f1e0..a38f50f715c 100644 --- a/openblas/platform/pom.xml +++ b/openblas/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} JavaCPP Presets Platform for OpenBLAS diff --git a/openblas/pom.xml b/openblas/pom.xml index 62b20005372..83118ab1bcd 100644 --- a/openblas/pom.xml +++ b/openblas/pom.xml @@ -11,7 +11,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} JavaCPP Presets for OpenBLAS diff --git a/openblas/samples/pom.xml b/openblas/samples/pom.xml index d3e9e0d6e79..14f63c68c74 100644 --- a/openblas/samples/pom.xml +++ b/openblas/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.14-1.5.6-SNAPSHOT + 0.3.15-1.5.6-SNAPSHOT diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java index 4a69f0918df..6fdecc55989 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java @@ -46,7 +46,7 @@ public class openblas extends org.bytedeco.openblas.presets.openblas { public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.14 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.15 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) @@ -10556,6 +10556,14 @@ public static native void LAPACK_zgetsls( @Cast("lapack_complex_double*") double[] work, @Const int[] lwork, int[] info ); + + + + + + + + public static native void LAPACK_cggbak( @Cast("const char*") BytePointer job, @Cast("const char*") BytePointer side, @Const IntPointer n, @Const IntPointer ilo, @Const IntPointer ihi, @@ -18832,74 +18840,74 @@ public static native void LAPACK_chegst( @Const IntPointer itype, @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Cast("lapack_complex_float*") FloatPointer A, @Const IntPointer lda, - @Cast("lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, + @Cast("const lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, IntPointer info ); public static native void LAPACK_chegst( @Const IntBuffer itype, String uplo, @Const IntBuffer n, @Cast("lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, - @Cast("lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, + @Cast("const lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, IntBuffer info ); public static native void LAPACK_chegst( @Const int[] itype, @Cast("const char*") BytePointer uplo, @Const int[] n, @Cast("lapack_complex_float*") float[] A, @Const int[] lda, - @Cast("lapack_complex_float*") float[] B, @Const int[] ldb, + @Cast("const lapack_complex_float*") float[] B, @Const int[] ldb, int[] info ); public static native void LAPACK_chegst( @Const IntPointer itype, String uplo, @Const IntPointer n, @Cast("lapack_complex_float*") FloatPointer A, @Const IntPointer lda, - @Cast("lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, + @Cast("const lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, IntPointer info ); public static native void LAPACK_chegst( @Const IntBuffer itype, @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Cast("lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, - @Cast("lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, + @Cast("const lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, IntBuffer info ); public static native void LAPACK_chegst( @Const int[] itype, String uplo, @Const int[] n, @Cast("lapack_complex_float*") float[] A, @Const int[] lda, - @Cast("lapack_complex_float*") float[] B, @Const int[] ldb, + @Cast("const lapack_complex_float*") float[] B, @Const int[] ldb, int[] info ); public static native void LAPACK_zhegst( @Const IntPointer itype, @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Cast("lapack_complex_double*") DoublePointer A, @Const IntPointer lda, - @Cast("lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, + @Cast("const lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, IntPointer info ); public static native void LAPACK_zhegst( @Const IntBuffer itype, String uplo, @Const IntBuffer n, @Cast("lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, - @Cast("lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, + @Cast("const lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, IntBuffer info ); public static native void LAPACK_zhegst( @Const int[] itype, @Cast("const char*") BytePointer uplo, @Const int[] n, @Cast("lapack_complex_double*") double[] A, @Const int[] lda, - @Cast("lapack_complex_double*") double[] B, @Const int[] ldb, + @Cast("const lapack_complex_double*") double[] B, @Const int[] ldb, int[] info ); public static native void LAPACK_zhegst( @Const IntPointer itype, String uplo, @Const IntPointer n, @Cast("lapack_complex_double*") DoublePointer A, @Const IntPointer lda, - @Cast("lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, + @Cast("const lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, IntPointer info ); public static native void LAPACK_zhegst( @Const IntBuffer itype, @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Cast("lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, - @Cast("lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, + @Cast("const lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, IntBuffer info ); public static native void LAPACK_zhegst( @Const int[] itype, String uplo, @Const int[] n, @Cast("lapack_complex_double*") double[] A, @Const int[] lda, - @Cast("lapack_complex_double*") double[] B, @Const int[] ldb, + @Cast("const lapack_complex_double*") double[] B, @Const int[] ldb, int[] info ); public static native void LAPACK_chegv( @@ -29167,6 +29175,10 @@ public static native void LAPACK_sorgtr( float[] work, @Const int[] lwork, int[] info ); + + + + public static native void LAPACK_dormbr( @Cast("const char*") BytePointer vect, @Cast("const char*") BytePointer side, @Cast("const char*") BytePointer trans, @Const IntPointer m, @Const IntPointer n, @Const IntPointer k, @@ -48252,42 +48264,42 @@ public static native void LAPACK_zsytrs( public static native void LAPACK_csytrs2( @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Const IntPointer nrhs, - @Cast("lapack_complex_float*") FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Cast("const lapack_complex_float*") FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, @Cast("lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, @Cast("lapack_complex_float*") FloatPointer work, IntPointer info ); public static native void LAPACK_csytrs2( String uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - @Cast("lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Cast("const lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, @Cast("lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, @Cast("lapack_complex_float*") FloatBuffer work, IntBuffer info ); public static native void LAPACK_csytrs2( @Cast("const char*") BytePointer uplo, @Const int[] n, @Const int[] nrhs, - @Cast("lapack_complex_float*") float[] A, @Const int[] lda, @Const int[] ipiv, + @Cast("const lapack_complex_float*") float[] A, @Const int[] lda, @Const int[] ipiv, @Cast("lapack_complex_float*") float[] B, @Const int[] ldb, @Cast("lapack_complex_float*") float[] work, int[] info ); public static native void LAPACK_csytrs2( String uplo, @Const IntPointer n, @Const IntPointer nrhs, - @Cast("lapack_complex_float*") FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Cast("const lapack_complex_float*") FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, @Cast("lapack_complex_float*") FloatPointer B, @Const IntPointer ldb, @Cast("lapack_complex_float*") FloatPointer work, IntPointer info ); public static native void LAPACK_csytrs2( @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - @Cast("lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Cast("const lapack_complex_float*") FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, @Cast("lapack_complex_float*") FloatBuffer B, @Const IntBuffer ldb, @Cast("lapack_complex_float*") FloatBuffer work, IntBuffer info ); public static native void LAPACK_csytrs2( String uplo, @Const int[] n, @Const int[] nrhs, - @Cast("lapack_complex_float*") float[] A, @Const int[] lda, @Const int[] ipiv, + @Cast("const lapack_complex_float*") float[] A, @Const int[] lda, @Const int[] ipiv, @Cast("lapack_complex_float*") float[] B, @Const int[] ldb, @Cast("lapack_complex_float*") float[] work, int[] info ); @@ -48295,42 +48307,42 @@ public static native void LAPACK_csytrs2( public static native void LAPACK_dsytrs2( @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Const IntPointer nrhs, - DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Const DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, DoublePointer B, @Const IntPointer ldb, DoublePointer work, IntPointer info ); public static native void LAPACK_dsytrs2( String uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Const DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, DoubleBuffer B, @Const IntBuffer ldb, DoubleBuffer work, IntBuffer info ); public static native void LAPACK_dsytrs2( @Cast("const char*") BytePointer uplo, @Const int[] n, @Const int[] nrhs, - double[] A, @Const int[] lda, @Const int[] ipiv, + @Const double[] A, @Const int[] lda, @Const int[] ipiv, double[] B, @Const int[] ldb, double[] work, int[] info ); public static native void LAPACK_dsytrs2( String uplo, @Const IntPointer n, @Const IntPointer nrhs, - DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Const DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, DoublePointer B, @Const IntPointer ldb, DoublePointer work, IntPointer info ); public static native void LAPACK_dsytrs2( @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Const DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, DoubleBuffer B, @Const IntBuffer ldb, DoubleBuffer work, IntBuffer info ); public static native void LAPACK_dsytrs2( String uplo, @Const int[] n, @Const int[] nrhs, - double[] A, @Const int[] lda, @Const int[] ipiv, + @Const double[] A, @Const int[] lda, @Const int[] ipiv, double[] B, @Const int[] ldb, double[] work, int[] info ); @@ -48338,42 +48350,42 @@ public static native void LAPACK_dsytrs2( public static native void LAPACK_ssytrs2( @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Const IntPointer nrhs, - FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Const FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, FloatPointer B, @Const IntPointer ldb, FloatPointer work, IntPointer info ); public static native void LAPACK_ssytrs2( String uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Const FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, FloatBuffer B, @Const IntBuffer ldb, FloatBuffer work, IntBuffer info ); public static native void LAPACK_ssytrs2( @Cast("const char*") BytePointer uplo, @Const int[] n, @Const int[] nrhs, - float[] A, @Const int[] lda, @Const int[] ipiv, + @Const float[] A, @Const int[] lda, @Const int[] ipiv, float[] B, @Const int[] ldb, float[] work, int[] info ); public static native void LAPACK_ssytrs2( String uplo, @Const IntPointer n, @Const IntPointer nrhs, - FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Const FloatPointer A, @Const IntPointer lda, @Const IntPointer ipiv, FloatPointer B, @Const IntPointer ldb, FloatPointer work, IntPointer info ); public static native void LAPACK_ssytrs2( @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Const FloatBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, FloatBuffer B, @Const IntBuffer ldb, FloatBuffer work, IntBuffer info ); public static native void LAPACK_ssytrs2( String uplo, @Const int[] n, @Const int[] nrhs, - float[] A, @Const int[] lda, @Const int[] ipiv, + @Const float[] A, @Const int[] lda, @Const int[] ipiv, float[] B, @Const int[] ldb, float[] work, int[] info ); @@ -48381,42 +48393,42 @@ public static native void LAPACK_ssytrs2( public static native void LAPACK_zsytrs2( @Cast("const char*") BytePointer uplo, @Const IntPointer n, @Const IntPointer nrhs, - @Cast("lapack_complex_double*") DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Cast("const lapack_complex_double*") DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, @Cast("lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, @Cast("lapack_complex_double*") DoublePointer work, IntPointer info ); public static native void LAPACK_zsytrs2( String uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - @Cast("lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Cast("const lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, @Cast("lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, @Cast("lapack_complex_double*") DoubleBuffer work, IntBuffer info ); public static native void LAPACK_zsytrs2( @Cast("const char*") BytePointer uplo, @Const int[] n, @Const int[] nrhs, - @Cast("lapack_complex_double*") double[] A, @Const int[] lda, @Const int[] ipiv, + @Cast("const lapack_complex_double*") double[] A, @Const int[] lda, @Const int[] ipiv, @Cast("lapack_complex_double*") double[] B, @Const int[] ldb, @Cast("lapack_complex_double*") double[] work, int[] info ); public static native void LAPACK_zsytrs2( String uplo, @Const IntPointer n, @Const IntPointer nrhs, - @Cast("lapack_complex_double*") DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, + @Cast("const lapack_complex_double*") DoublePointer A, @Const IntPointer lda, @Const IntPointer ipiv, @Cast("lapack_complex_double*") DoublePointer B, @Const IntPointer ldb, @Cast("lapack_complex_double*") DoublePointer work, IntPointer info ); public static native void LAPACK_zsytrs2( @Cast("const char*") BytePointer uplo, @Const IntBuffer n, @Const IntBuffer nrhs, - @Cast("lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, + @Cast("const lapack_complex_double*") DoubleBuffer A, @Const IntBuffer lda, @Const IntBuffer ipiv, @Cast("lapack_complex_double*") DoubleBuffer B, @Const IntBuffer ldb, @Cast("lapack_complex_double*") DoubleBuffer work, IntBuffer info ); public static native void LAPACK_zsytrs2( String uplo, @Const int[] n, @Const int[] nrhs, - @Cast("lapack_complex_double*") double[] A, @Const int[] lda, @Const int[] ipiv, + @Cast("const lapack_complex_double*") double[] A, @Const int[] lda, @Const int[] ipiv, @Cast("lapack_complex_double*") double[] B, @Const int[] ldb, @Cast("lapack_complex_double*") double[] work, int[] info ); @@ -57193,6 +57205,10 @@ public static native void LAPACK_zungtr( @Cast("lapack_complex_double*") double[] work, @Const int[] lwork, int[] info ); + + + + public static native void LAPACK_cunmbr( @Cast("const char*") BytePointer vect, @Cast("const char*") BytePointer side, @Cast("const char*") BytePointer trans, @Const IntPointer m, @Const IntPointer n, @Const IntPointer k, @@ -62739,27 +62755,27 @@ public static native int LAPACKE_zheevx( int matrix_layout, @Cast("char") byte j public static native int LAPACKE_chegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") FloatPointer a, - int lda, @Cast("lapack_complex_float*") FloatPointer b, + int lda, @Cast("const lapack_complex_float*") FloatPointer b, int ldb ); public static native int LAPACKE_chegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") FloatBuffer a, - int lda, @Cast("lapack_complex_float*") FloatBuffer b, + int lda, @Cast("const lapack_complex_float*") FloatBuffer b, int ldb ); public static native int LAPACKE_chegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") float[] a, - int lda, @Cast("lapack_complex_float*") float[] b, + int lda, @Cast("const lapack_complex_float*") float[] b, int ldb ); public static native int LAPACKE_zhegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") DoublePointer a, - int lda, @Cast("lapack_complex_double*") DoublePointer b, + int lda, @Cast("const lapack_complex_double*") DoublePointer b, int ldb ); public static native int LAPACKE_zhegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") DoubleBuffer a, - int lda, @Cast("lapack_complex_double*") DoubleBuffer b, + int lda, @Cast("const lapack_complex_double*") DoubleBuffer b, int ldb ); public static native int LAPACKE_zhegst( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") double[] a, - int lda, @Cast("lapack_complex_double*") double[] b, + int lda, @Cast("const lapack_complex_double*") double[] b, int ldb ); public static native int LAPACKE_chegv( int matrix_layout, int itype, @Cast("char") byte jobz, @@ -64606,6 +64622,9 @@ public static native int LAPACKE_dorgtr( int matrix_layout, @Cast("char") byte u public static native int LAPACKE_dorgtr( int matrix_layout, @Cast("char") byte uplo, int n, double[] a, int lda, @Const double[] tau ); + + + public static native int LAPACKE_sormbr( int matrix_layout, @Cast("char") byte vect, @Cast("char") byte side, @Cast("char") byte trans, int m, int n, int k, @Const FloatPointer a, int lda, @Const FloatPointer tau, @@ -69831,6 +69850,9 @@ public static native int LAPACKE_zungtr( int matrix_layout, @Cast("char") byte u @Cast("lapack_complex_double*") double[] a, int lda, @Cast("const lapack_complex_double*") double[] tau ); + + + public static native int LAPACKE_cunmbr( int matrix_layout, @Cast("char") byte vect, @Cast("char") byte side, @Cast("char") byte trans, int m, int n, int k, @Cast("const lapack_complex_float*") FloatPointer a, int lda, @@ -75740,27 +75762,27 @@ public static native int LAPACKE_zheevx_work( int matrix_layout, @Cast("char") b public static native int LAPACKE_chegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") FloatPointer a, - int lda, @Cast("lapack_complex_float*") FloatPointer b, + int lda, @Cast("const lapack_complex_float*") FloatPointer b, int ldb ); public static native int LAPACKE_chegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") FloatBuffer a, - int lda, @Cast("lapack_complex_float*") FloatBuffer b, + int lda, @Cast("const lapack_complex_float*") FloatBuffer b, int ldb ); public static native int LAPACKE_chegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_float*") float[] a, - int lda, @Cast("lapack_complex_float*") float[] b, + int lda, @Cast("const lapack_complex_float*") float[] b, int ldb ); public static native int LAPACKE_zhegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") DoublePointer a, - int lda, @Cast("lapack_complex_double*") DoublePointer b, + int lda, @Cast("const lapack_complex_double*") DoublePointer b, int ldb ); public static native int LAPACKE_zhegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") DoubleBuffer a, - int lda, @Cast("lapack_complex_double*") DoubleBuffer b, + int lda, @Cast("const lapack_complex_double*") DoubleBuffer b, int ldb ); public static native int LAPACKE_zhegst_work( int matrix_layout, int itype, @Cast("char") byte uplo, int n, @Cast("lapack_complex_double*") double[] a, - int lda, @Cast("lapack_complex_double*") double[] b, + int lda, @Cast("const lapack_complex_double*") double[] b, int ldb ); public static native int LAPACKE_chegv_work( int matrix_layout, int itype, @Cast("char") byte jobz, @@ -78213,6 +78235,9 @@ public static native int LAPACKE_dorgtr_work( int matrix_layout, @Cast("char") b double[] a, int lda, @Const double[] tau, double[] work, int lwork ); + + + public static native int LAPACKE_sormbr_work( int matrix_layout, @Cast("char") byte vect, @Cast("char") byte side, @Cast("char") byte trans, int m, int n, int k, @Const FloatPointer a, int lda, @@ -84623,6 +84648,9 @@ public static native int LAPACKE_zungtr_work( int matrix_layout, @Cast("char") b @Cast("const lapack_complex_double*") double[] tau, @Cast("lapack_complex_double*") double[] work, int lwork ); + + + public static native int LAPACKE_cunmbr_work( int matrix_layout, @Cast("char") byte vect, @Cast("char") byte side, @Cast("char") byte trans, int m, int n, int k, @Cast("const lapack_complex_float*") FloatPointer a, @@ -85389,29 +85417,29 @@ public static native int LAPACKE_csytri2x_work( int matrix_layout, @Cast("char") @Const int[] ipiv, @Cast("lapack_complex_float*") float[] work, int nb ); public static native int LAPACKE_csytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") FloatPointer a, + int nrhs, @Cast("const lapack_complex_float*") FloatPointer a, int lda, @Const IntPointer ipiv, @Cast("lapack_complex_float*") FloatPointer b, int ldb ); public static native int LAPACKE_csytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") FloatBuffer a, + int nrhs, @Cast("const lapack_complex_float*") FloatBuffer a, int lda, @Const IntBuffer ipiv, @Cast("lapack_complex_float*") FloatBuffer b, int ldb ); public static native int LAPACKE_csytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") float[] a, + int nrhs, @Cast("const lapack_complex_float*") float[] a, int lda, @Const int[] ipiv, @Cast("lapack_complex_float*") float[] b, int ldb ); public static native int LAPACKE_csytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") FloatPointer a, + int nrhs, @Cast("const lapack_complex_float*") FloatPointer a, int lda, @Const IntPointer ipiv, @Cast("lapack_complex_float*") FloatPointer b, int ldb, @Cast("lapack_complex_float*") FloatPointer work ); public static native int LAPACKE_csytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") FloatBuffer a, + int nrhs, @Cast("const lapack_complex_float*") FloatBuffer a, int lda, @Const IntBuffer ipiv, @Cast("lapack_complex_float*") FloatBuffer b, int ldb, @Cast("lapack_complex_float*") FloatBuffer work ); public static native int LAPACKE_csytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_float*") float[] a, + int nrhs, @Cast("const lapack_complex_float*") float[] a, int lda, @Const int[] ipiv, @Cast("lapack_complex_float*") float[] b, int ldb, @Cast("lapack_complex_float*") float[] work ); @@ -85884,24 +85912,24 @@ public static native int LAPACKE_dsytri2x_work( int matrix_layout, @Cast("char") @Const int[] ipiv, double[] work, int nb ); public static native int LAPACKE_dsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, DoublePointer a, int lda, + int nrhs, @Const DoublePointer a, int lda, @Const IntPointer ipiv, DoublePointer b, int ldb ); public static native int LAPACKE_dsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, DoubleBuffer a, int lda, + int nrhs, @Const DoubleBuffer a, int lda, @Const IntBuffer ipiv, DoubleBuffer b, int ldb ); public static native int LAPACKE_dsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, double[] a, int lda, + int nrhs, @Const double[] a, int lda, @Const int[] ipiv, double[] b, int ldb ); public static native int LAPACKE_dsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, DoublePointer a, + int nrhs, @Const DoublePointer a, int lda, @Const IntPointer ipiv, DoublePointer b, int ldb, DoublePointer work ); public static native int LAPACKE_dsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, DoubleBuffer a, + int nrhs, @Const DoubleBuffer a, int lda, @Const IntBuffer ipiv, DoubleBuffer b, int ldb, DoubleBuffer work ); public static native int LAPACKE_dsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, double[] a, + int nrhs, @Const double[] a, int lda, @Const int[] ipiv, double[] b, int ldb, double[] work ); public static native int LAPACKE_sbbcsd( int matrix_layout, @Cast("char") byte jobu1, @Cast("char") byte jobu2, @@ -86169,24 +86197,24 @@ public static native int LAPACKE_ssytri2x_work( int matrix_layout, @Cast("char") @Const int[] ipiv, float[] work, int nb ); public static native int LAPACKE_ssytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, FloatPointer a, int lda, + int nrhs, @Const FloatPointer a, int lda, @Const IntPointer ipiv, FloatPointer b, int ldb ); public static native int LAPACKE_ssytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, FloatBuffer a, int lda, + int nrhs, @Const FloatBuffer a, int lda, @Const IntBuffer ipiv, FloatBuffer b, int ldb ); public static native int LAPACKE_ssytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, float[] a, int lda, + int nrhs, @Const float[] a, int lda, @Const int[] ipiv, float[] b, int ldb ); public static native int LAPACKE_ssytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, FloatPointer a, + int nrhs, @Const FloatPointer a, int lda, @Const IntPointer ipiv, FloatPointer b, int ldb, FloatPointer work ); public static native int LAPACKE_ssytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, FloatBuffer a, + int nrhs, @Const FloatBuffer a, int lda, @Const IntBuffer ipiv, FloatBuffer b, int ldb, FloatBuffer work ); public static native int LAPACKE_ssytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, float[] a, + int nrhs, @Const float[] a, int lda, @Const int[] ipiv, float[] b, int ldb, float[] work ); public static native int LAPACKE_zbbcsd( int matrix_layout, @Cast("char") byte jobu1, @Cast("char") byte jobu2, @@ -86424,29 +86452,29 @@ public static native int LAPACKE_zsytri2x_work( int matrix_layout, @Cast("char") @Const int[] ipiv, @Cast("lapack_complex_double*") double[] work, int nb ); public static native int LAPACKE_zsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") DoublePointer a, + int nrhs, @Cast("const lapack_complex_double*") DoublePointer a, int lda, @Const IntPointer ipiv, @Cast("lapack_complex_double*") DoublePointer b, int ldb ); public static native int LAPACKE_zsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") DoubleBuffer a, + int nrhs, @Cast("const lapack_complex_double*") DoubleBuffer a, int lda, @Const IntBuffer ipiv, @Cast("lapack_complex_double*") DoubleBuffer b, int ldb ); public static native int LAPACKE_zsytrs2( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") double[] a, + int nrhs, @Cast("const lapack_complex_double*") double[] a, int lda, @Const int[] ipiv, @Cast("lapack_complex_double*") double[] b, int ldb ); public static native int LAPACKE_zsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") DoublePointer a, + int nrhs, @Cast("const lapack_complex_double*") DoublePointer a, int lda, @Const IntPointer ipiv, @Cast("lapack_complex_double*") DoublePointer b, int ldb, @Cast("lapack_complex_double*") DoublePointer work ); public static native int LAPACKE_zsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") DoubleBuffer a, + int nrhs, @Cast("const lapack_complex_double*") DoubleBuffer a, int lda, @Const IntBuffer ipiv, @Cast("lapack_complex_double*") DoubleBuffer b, int ldb, @Cast("lapack_complex_double*") DoubleBuffer work ); public static native int LAPACKE_zsytrs2_work( int matrix_layout, @Cast("char") byte uplo, int n, - int nrhs, @Cast("lapack_complex_double*") double[] a, + int nrhs, @Cast("const lapack_complex_double*") double[] a, int lda, @Const int[] ipiv, @Cast("lapack_complex_double*") double[] b, int ldb, @Cast("lapack_complex_double*") double[] work ); @@ -89704,6 +89732,16 @@ public static native int LAPACKE_zgetsls_work( int matrix_layout, @Cast("char") @Cast("lapack_complex_double*") double[] b, int ldb, @Cast("lapack_complex_double*") double[] work, int lwork ); + + + + + + + + + + public static native int LAPACKE_ssyev_2stage( int matrix_layout, @Cast("char") byte jobz, @Cast("char") byte uplo, int n, FloatPointer a, int lda, FloatPointer w ); public static native int LAPACKE_ssyev_2stage( int matrix_layout, @Cast("char") byte jobz, @Cast("char") byte uplo, int n, diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java index 3145c952a92..0f6a7ef0e22 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java @@ -45,7 +45,7 @@ public class openblas_nolapack extends org.bytedeco.openblas.presets.openblas_no public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.14 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.15 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java index 02c456adfcf..8a78f68439e 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java @@ -143,6 +143,7 @@ public class openblas_nolapack implements LoadEnabled, InfoMapper { "cblas_simatcopy", "cblas_somatcopy", "cblas_zdotc", "cblas_zdotu", "cblas_zgeadd", "cblas_zimatcopy", "cblas_zomatcopy", "clacrm", "dlacrm", "slacrm", "zlacrm", "clarcm", "dlarcm", "slarcm", "zlarcm", "classq", "dlassq", "slassq", "zlassq", "cgesvdq", "dgesvdq", "sgesvdq", "zgesvdq", "lapack_make_complex_double", "lapack_make_complex_float", + "cgetsqrhrt", "dgetsqrhrt", "sgetsqrhrt", "zgetsqrhrt", "dorgtsqr_row", "sorgtsqr_row", "cungtsqr_row", "zungtsqr_row", // deprecated "cgegs", "cggsvd", "ctzrqf", "dgeqpf", "dlatzm", "sgelsx", "slahrd", "zgegv", "zggsvp", "cgegv", "cggsvp", "dgegs", "dggsvd", "dtzrqf", "sgeqpf", "slatzm", "zgelsx", "zlahrd", diff --git a/opencv/README.md b/opencv/README.md index df1e312b0eb..18826943be8 100644 --- a/opencv/README.md +++ b/opencv/README.md @@ -63,7 +63,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT @@ -77,7 +77,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.20.2-1.5.6-SNAPSHOT + 1.20.3-1.5.6-SNAPSHOT diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index 71219d3818a..e1b0fc57970 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index 5a99f2db577..b0de0b53988 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${project.groupId} diff --git a/opencv/pom.xml b/opencv/pom.xml index 206a7e5c5af..61f156524e6 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -18,12 +18,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true @@ -62,12 +62,12 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index c4604d6daad..3d0a1d5b57f 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 1.20.2-1.5.6-SNAPSHOT + 1.20.3-1.5.6-SNAPSHOT diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java index fb0c3882556..07f5bf05599 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_mcc.java @@ -340,7 +340,7 @@ public class opencv_mcc extends org.bytedeco.opencv.presets.opencv_mcc { return (DetectorParameters)super.position(position); } @Override public DetectorParameters getPointer(long i) { - return new DetectorParameters((Pointer)this).position(position + i); + return new DetectorParameters((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Board.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Board.java index 23213cefab5..bd303bea061 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Board.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Board.java @@ -55,7 +55,7 @@ public class Board extends Pointer { return (Board)super.position(position); } @Override public Board getPointer(long i) { - return new Board((Pointer)this).position(position + i); + return new Board((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/CharucoBoard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/CharucoBoard.java index dd39dad6031..957cd9b0706 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/CharucoBoard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/CharucoBoard.java @@ -55,7 +55,7 @@ public class CharucoBoard extends Board { return (CharucoBoard)super.position(position); } @Override public CharucoBoard getPointer(long i) { - return new CharucoBoard((Pointer)this).position(position + i); + return new CharucoBoard((Pointer)this).offsetAddress(i); } // vector of chessboard 3D corners precalculated diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/DetectorParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/DetectorParameters.java index d2f3a34065a..a2637385525 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/DetectorParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/DetectorParameters.java @@ -102,7 +102,7 @@ public class DetectorParameters extends Pointer { return (DetectorParameters)super.position(position); } @Override public DetectorParameters getPointer(long i) { - return new DetectorParameters((Pointer)this).position(position + i); + return new DetectorParameters((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Dictionary.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Dictionary.java index 450e706e4c2..03dea943c36 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Dictionary.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/Dictionary.java @@ -54,7 +54,7 @@ public class Dictionary extends Pointer { return (Dictionary)super.position(position); } @Override public Dictionary getPointer(long i) { - return new Dictionary((Pointer)this).position(position + i); + return new Dictionary((Pointer)this).offsetAddress(i); } public native @ByRef Mat bytesList(); public native Dictionary bytesList(Mat setter); // marker code information diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/GridBoard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/GridBoard.java index 32bdef56326..f4c3fd085a8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/GridBoard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_aruco/GridBoard.java @@ -50,7 +50,7 @@ public class GridBoard extends Board { return (GridBoard)super.position(position); } @Override public GridBoard getPointer(long i) { - return new GridBoard((Pointer)this).position(position + i); + return new GridBoard((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java index 714a2e99d80..53f4d9e5154 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBPDesc.java @@ -49,7 +49,7 @@ public class BackgroundSubtractorLSBPDesc extends Pointer { return (BackgroundSubtractorLSBPDesc)super.position(position); } @Override public BackgroundSubtractorLSBPDesc getPointer(long i) { - return new BackgroundSubtractorLSBPDesc((Pointer)this).position(position + i); + return new BackgroundSubtractorLSBPDesc((Pointer)this).offsetAddress(i); } public static native void calcLocalSVDValues(@ByVal Mat localSVDValues, @Const @ByRef Mat frame); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java index 52943f121b5..459dd90c9e3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaParameters.java @@ -97,7 +97,7 @@ public class RetinaParameters extends Pointer { return (RetinaParameters)super.position(position); } @Override public RetinaParameters getPointer(long i) { - return new RetinaParameters((Pointer)this).position(position + i); + return new RetinaParameters((Pointer)this).offsetAddress(i); } /** Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters */ @@ -112,7 +112,7 @@ public class RetinaParameters extends Pointer { return (OPLandIplParvoParameters)super.position(position); } @Override public OPLandIplParvoParameters getPointer(long i) { - return new OPLandIplParvoParameters((Pointer)this).position(position + i); + return new OPLandIplParvoParameters((Pointer)this).offsetAddress(i); } public OPLandIplParvoParameters() { super((Pointer)null); allocate(); } @@ -139,7 +139,7 @@ public class RetinaParameters extends Pointer { return (IplMagnoParameters)super.position(position); } @Override public IplMagnoParameters getPointer(long i) { - return new IplMagnoParameters((Pointer)this).position(position + i); + return new IplMagnoParameters((Pointer)this).offsetAddress(i); } public IplMagnoParameters() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java index 7889b6f9227..695c83908df 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/SegmentationParameters.java @@ -38,7 +38,7 @@ public class SegmentationParameters extends Pointer { return (SegmentationParameters)super.position(position); } @Override public SegmentationParameters getPointer(long i) { - return new SegmentationParameters((Pointer)this).position(position + i); + return new SegmentationParameters((Pointer)this).offsetAddress(i); } // CV_EXPORTS_W_MAP to export to python native dictionnaries // default structure instance construction with default values diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java index d08f0afd687..3469735a9d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CirclesGridFinderParameters.java @@ -38,7 +38,7 @@ public class CirclesGridFinderParameters extends Pointer { return (CirclesGridFinderParameters)super.position(position); } @Override public CirclesGridFinderParameters getPointer(long i) { - return new CirclesGridFinderParameters((Pointer)this).position(position + i); + return new CirclesGridFinderParameters((Pointer)this).offsetAddress(i); } public CirclesGridFinderParameters() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java index 0d7acd4a9eb..54cc40f2ef5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/CvLevMarq.java @@ -39,7 +39,7 @@ public class CvLevMarq extends Pointer { return (CvLevMarq)super.position(position); } @Override public CvLevMarq getPointer(long i) { - return new CvLevMarq((Pointer)this).position(position + i); + return new CvLevMarq((Pointer)this).offsetAddress(i); } public CvLevMarq() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java index 66941beb69d..97c1c7714b3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/UsacParams.java @@ -38,7 +38,7 @@ public class UsacParams extends Pointer { return (UsacParams)super.position(position); } @Override public UsacParams getPointer(long i) { - return new UsacParams((Pointer)this).position(position + i); + return new UsacParams((Pointer)this).offsetAddress(i); } // in alphabetical order public UsacParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java index a680b557a15..2b55a8a724c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java @@ -37,7 +37,7 @@ public class Algorithm extends Pointer { return (Algorithm)super.position(position); } @Override public Algorithm getPointer(long i) { - return new Algorithm((Pointer)this).position(position + i); + return new Algorithm((Pointer)this).offsetAddress(i); } public Algorithm() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java index 99e98c07dd5..c6e10847e3a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/AsyncArray.java @@ -39,7 +39,7 @@ public class AsyncArray extends Pointer { return (AsyncArray)super.position(position); } @Override public AsyncArray getPointer(long i) { - return new AsyncArray((Pointer)this).position(position + i); + return new AsyncArray((Pointer)this).offsetAddress(i); } public AsyncArray() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java index 1cb3ddebf3d..c7477c046a1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv16suf.java @@ -29,7 +29,7 @@ public class Cv16suf extends Pointer { return (Cv16suf)super.position(position); } @Override public Cv16suf getPointer(long i) { - return new Cv16suf((Pointer)this).position(position + i); + return new Cv16suf((Pointer)this).offsetAddress(i); } public native short i(); public native Cv16suf i(short setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java index 18d78408558..30baaf2a63c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv32suf.java @@ -28,7 +28,7 @@ public class Cv32suf extends Pointer { return (Cv32suf)super.position(position); } @Override public Cv32suf getPointer(long i) { - return new Cv32suf((Pointer)this).position(position + i); + return new Cv32suf((Pointer)this).offsetAddress(i); } public native int i(); public native Cv32suf i(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java index 13d2b561058..14da54bf10e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Cv64suf.java @@ -28,7 +28,7 @@ public class Cv64suf extends Pointer { return (Cv64suf)super.position(position); } @Override public Cv64suf getPointer(long i) { - return new Cv64suf((Pointer)this).position(position + i); + return new Cv64suf((Pointer)this).offsetAddress(i); } public native @Cast("int64") long i(); public native Cv64suf i(long setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java index b86589f9f22..ddeffb599fc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvBox2D.java @@ -31,7 +31,7 @@ public class CvBox2D extends AbstractCvBox2D { return (CvBox2D)super.position(position); } @Override public CvBox2D getPointer(long i) { - return new CvBox2D((Pointer)this).position(position + i); + return new CvBox2D((Pointer)this).offsetAddress(i); } /** Center of the box. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java index 36abcb931cb..c0495a17915 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvChain.java @@ -32,7 +32,7 @@ public class CvChain extends CvSeq { return (CvChain)super.position(position); } @Override public CvChain getPointer(long i) { - return new CvChain((Pointer)this).position(position + i); + return new CvChain((Pointer)this).offsetAddress(i); } /** Miscellaneous flags. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java index ad9692d61f0..dd3c55e70f4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvContour.java @@ -28,7 +28,7 @@ public class CvContour extends CvSeq { return (CvContour)super.position(position); } @Override public CvContour getPointer(long i) { - return new CvContour((Pointer)this).position(position + i); + return new CvContour((Pointer)this).offsetAddress(i); } /** Miscellaneous flags. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java index f0ab8535ac0..0cca7170b22 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraph.java @@ -28,7 +28,7 @@ public class CvGraph extends AbstractCvGraph { return (CvGraph)super.position(position); } @Override public CvGraph getPointer(long i) { - return new CvGraph((Pointer)this).position(position + i); + return new CvGraph((Pointer)this).offsetAddress(i); } /** Miscellaneous flags. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java index be249c9e726..b34a46e5761 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphEdge.java @@ -29,7 +29,7 @@ public class CvGraphEdge extends Pointer { return (CvGraphEdge)super.position(position); } @Override public CvGraphEdge getPointer(long i) { - return new CvGraphEdge((Pointer)this).position(position + i); + return new CvGraphEdge((Pointer)this).offsetAddress(i); } public native int flags(); public native CvGraphEdge flags(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java index 4bec9dabca9..3a3d984444b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphScanner.java @@ -28,7 +28,7 @@ public class CvGraphScanner extends AbstractCvGraphScanner { return (CvGraphScanner)super.position(position); } @Override public CvGraphScanner getPointer(long i) { - return new CvGraphScanner((Pointer)this).position(position + i); + return new CvGraphScanner((Pointer)this).offsetAddress(i); } public native CvGraphVtx vtx(); public native CvGraphScanner vtx(CvGraphVtx setter); /* current graph vertex (or current edge origin) */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java index f7d001115ca..c15b015ccf4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx.java @@ -28,7 +28,7 @@ public class CvGraphVtx extends Pointer { return (CvGraphVtx)super.position(position); } @Override public CvGraphVtx getPointer(long i) { - return new CvGraphVtx((Pointer)this).position(position + i); + return new CvGraphVtx((Pointer)this).offsetAddress(i); } public native int flags(); public native CvGraphVtx flags(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java index 429062e4537..d568ac6f2e3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvGraphVtx2D.java @@ -28,7 +28,7 @@ public class CvGraphVtx2D extends CvGraphVtx { return (CvGraphVtx2D)super.position(position); } @Override public CvGraphVtx2D getPointer(long i) { - return new CvGraphVtx2D((Pointer)this).position(position + i); + return new CvGraphVtx2D((Pointer)this).offsetAddress(i); } public native int flags(); public native CvGraphVtx2D flags(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java index ad76c982f68..ab421818526 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvHistogram.java @@ -28,7 +28,7 @@ public class CvHistogram extends org.bytedeco.opencv.opencv_imgproc.AbstractCvHi return (CvHistogram)super.position(position); } @Override public CvHistogram getPointer(long i) { - return new CvHistogram((Pointer)this).position(position + i); + return new CvHistogram((Pointer)this).offsetAddress(i); } public native int type(); public native CvHistogram type(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java index 33393fe7e18..b5802cf38f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvLineIterator.java @@ -31,7 +31,7 @@ public class CvLineIterator extends Pointer { return (CvLineIterator)super.position(position); } @Override public CvLineIterator getPointer(long i) { - return new CvLineIterator((Pointer)this).position(position + i); + return new CvLineIterator((Pointer)this).offsetAddress(i); } /** Pointer to the current point: */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java index ddfd9a635a9..001ffc745af 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMat.java @@ -40,7 +40,7 @@ public class CvMat extends AbstractCvMat { return (CvMat)super.position(position); } @Override public CvMat getPointer(long i) { - return new CvMat((Pointer)this).position(position + i); + return new CvMat((Pointer)this).offsetAddress(i); } public native int type(); public native CvMat type(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java index 4c28ddee140..651bf33d455 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java @@ -32,6 +32,6 @@ public class CvMatDefaultDeleter extends Pointer { return (CvMatDefaultDeleter)super.position(position); } @Override public CvMatDefaultDeleter getPointer(long i) { - return new CvMatDefaultDeleter((Pointer)this).position(position + i); + return new CvMatDefaultDeleter((Pointer)this).offsetAddress(i); } public native @Name("operator ()") void apply(CvMat obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java index 3712f31c1b4..b10e7dccf4a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatND.java @@ -32,7 +32,7 @@ public class CvMatND extends AbstractCvMatND { return (CvMatND)super.position(position); } @Override public CvMatND getPointer(long i) { - return new CvMatND((Pointer)this).position(position + i); + return new CvMatND((Pointer)this).offsetAddress(i); } public native int type(); public native CvMatND type(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java index 73cbc0e00a4..ecf4da07d32 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemBlock.java @@ -34,7 +34,7 @@ public class CvMemBlock extends Pointer { return (CvMemBlock)super.position(position); } @Override public CvMemBlock getPointer(long i) { - return new CvMemBlock((Pointer)this).position(position + i); + return new CvMemBlock((Pointer)this).offsetAddress(i); } public native CvMemBlock prev(); public native CvMemBlock prev(CvMemBlock setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java index d562363cbc7..0671aba7d6b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStorage.java @@ -28,7 +28,7 @@ public class CvMemStorage extends AbstractCvMemStorage { return (CvMemStorage)super.position(position); } @Override public CvMemStorage getPointer(long i) { - return new CvMemStorage((Pointer)this).position(position + i); + return new CvMemStorage((Pointer)this).offsetAddress(i); } public native int signature(); public native CvMemStorage signature(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java index cb5cb78e26c..2114d917fe4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMemStoragePos.java @@ -29,7 +29,7 @@ public class CvMemStoragePos extends Pointer { return (CvMemStoragePos)super.position(position); } @Override public CvMemStoragePos getPointer(long i) { - return new CvMemStoragePos((Pointer)this).position(position + i); + return new CvMemStoragePos((Pointer)this).offsetAddress(i); } public native CvMemBlock top(); public native CvMemStoragePos top(CvMemBlock setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java index ce79353788e..ef9c78836bc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvNArrayIterator.java @@ -29,7 +29,7 @@ public class CvNArrayIterator extends Pointer { return (CvNArrayIterator)super.position(position); } @Override public CvNArrayIterator getPointer(long i) { - return new CvNArrayIterator((Pointer)this).position(position + i); + return new CvNArrayIterator((Pointer)this).offsetAddress(i); } /** number of arrays */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java index ccd7df9e7f6..c6f5c70bdf1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint.java @@ -29,7 +29,7 @@ public class CvPoint extends AbstractCvPoint { return (CvPoint)super.position(position); } @Override public CvPoint getPointer(long i) { - return new CvPoint((Pointer)this).position(position + i); + return new CvPoint((Pointer)this).offsetAddress(i); } public native int x(); public native CvPoint x(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java index b47c4a82fde..f5b591c84a7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D32f.java @@ -26,7 +26,7 @@ public class CvPoint2D32f extends AbstractCvPoint2D32f { return (CvPoint2D32f)super.position(position); } @Override public CvPoint2D32f getPointer(long i) { - return new CvPoint2D32f((Pointer)this).position(position + i); + return new CvPoint2D32f((Pointer)this).offsetAddress(i); } public native float x(); public native CvPoint2D32f x(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java index ad85f95128c..c30db7791ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint2D64f.java @@ -27,7 +27,7 @@ public class CvPoint2D64f extends AbstractCvPoint2D64f { return (CvPoint2D64f)super.position(position); } @Override public CvPoint2D64f getPointer(long i) { - return new CvPoint2D64f((Pointer)this).position(position + i); + return new CvPoint2D64f((Pointer)this).offsetAddress(i); } public native double x(); public native CvPoint2D64f x(double setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java index 16b58a1862c..88b9526ac09 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D32f.java @@ -26,7 +26,7 @@ public class CvPoint3D32f extends AbstractCvPoint3D32f { return (CvPoint3D32f)super.position(position); } @Override public CvPoint3D32f getPointer(long i) { - return new CvPoint3D32f((Pointer)this).position(position + i); + return new CvPoint3D32f((Pointer)this).offsetAddress(i); } public native float x(); public native CvPoint3D32f x(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java index 5d2d304f8c2..e5dd7bc4002 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvPoint3D64f.java @@ -26,7 +26,7 @@ public class CvPoint3D64f extends AbstractCvPoint3D64f { return (CvPoint3D64f)super.position(position); } @Override public CvPoint3D64f getPointer(long i) { - return new CvPoint3D64f((Pointer)this).position(position + i); + return new CvPoint3D64f((Pointer)this).offsetAddress(i); } public native double x(); public native CvPoint3D64f x(double setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java index 701128955f5..ca877b87188 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvRect.java @@ -31,7 +31,7 @@ public class CvRect extends AbstractCvRect { return (CvRect)super.position(position); } @Override public CvRect getPointer(long i) { - return new CvRect((Pointer)this).position(position + i); + return new CvRect((Pointer)this).offsetAddress(i); } public native int x(); public native CvRect x(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java index 7f0e43e2833..a07389dd173 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvScalar.java @@ -30,7 +30,7 @@ public class CvScalar extends AbstractCvScalar { return (CvScalar)super.position(position); } @Override public CvScalar getPointer(long i) { - return new CvScalar((Pointer)this).position(position + i); + return new CvScalar((Pointer)this).offsetAddress(i); } public native double val(int i); public native CvScalar val(int i, double setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java index 88cb293043e..37ce9d617ab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeq.java @@ -28,7 +28,7 @@ public class CvSeq extends AbstractCvSeq { return (CvSeq)super.position(position); } @Override public CvSeq getPointer(long i) { - return new CvSeq((Pointer)this).position(position + i); + return new CvSeq((Pointer)this).offsetAddress(i); } /** Miscellaneous flags. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java index 8005896571f..750a2795624 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqBlock.java @@ -31,7 +31,7 @@ public class CvSeqBlock extends Pointer { return (CvSeqBlock)super.position(position); } @Override public CvSeqBlock getPointer(long i) { - return new CvSeqBlock((Pointer)this).position(position + i); + return new CvSeqBlock((Pointer)this).offsetAddress(i); } /** Previous sequence block. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java index 0ab1e520c7e..c6a6f6cc003 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqReader.java @@ -28,7 +28,7 @@ public class CvSeqReader extends Pointer { return (CvSeqReader)super.position(position); } @Override public CvSeqReader getPointer(long i) { - return new CvSeqReader((Pointer)this).position(position + i); + return new CvSeqReader((Pointer)this).offsetAddress(i); } public native int header_size(); public native CvSeqReader header_size(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java index d3f20781e84..68127a3cfad 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSeqWriter.java @@ -28,7 +28,7 @@ public class CvSeqWriter extends Pointer { return (CvSeqWriter)super.position(position); } @Override public CvSeqWriter getPointer(long i) { - return new CvSeqWriter((Pointer)this).position(position + i); + return new CvSeqWriter((Pointer)this).offsetAddress(i); } public native int header_size(); public native CvSeqWriter header_size(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java index dfbfbb5bf77..73cb70c1d70 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSet.java @@ -28,7 +28,7 @@ public class CvSet extends AbstractCvSet { return (CvSet)super.position(position); } @Override public CvSet getPointer(long i) { - return new CvSet((Pointer)this).position(position + i); + return new CvSet((Pointer)this).offsetAddress(i); } /** Miscellaneous flags. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java index 27246d4b771..8c10192cd4f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSetElem.java @@ -28,7 +28,7 @@ public class CvSetElem extends Pointer { return (CvSetElem)super.position(position); } @Override public CvSetElem getPointer(long i) { - return new CvSetElem((Pointer)this).position(position + i); + return new CvSetElem((Pointer)this).offsetAddress(i); } public native int flags(); public native CvSetElem flags(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java index 957a33c5f72..8a70d3cf7ef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize.java @@ -28,7 +28,7 @@ public class CvSize extends AbstractCvSize { return (CvSize)super.position(position); } @Override public CvSize getPointer(long i) { - return new CvSize((Pointer)this).position(position + i); + return new CvSize((Pointer)this).offsetAddress(i); } public native int width(); public native CvSize width(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java index b94fd701021..6309796b107 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSize2D32f.java @@ -26,7 +26,7 @@ public class CvSize2D32f extends AbstractCvSize2D32f { return (CvSize2D32f)super.position(position); } @Override public CvSize2D32f getPointer(long i) { - return new CvSize2D32f((Pointer)this).position(position + i); + return new CvSize2D32f((Pointer)this).offsetAddress(i); } public native float width(); public native CvSize2D32f width(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java index 9169dea21d3..26b255a40ff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSlice.java @@ -25,7 +25,7 @@ public class CvSlice extends Pointer { return (CvSlice)super.position(position); } @Override public CvSlice getPointer(long i) { - return new CvSlice((Pointer)this).position(position + i); + return new CvSlice((Pointer)this).offsetAddress(i); } public native int start_index(); public native CvSlice start_index(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java index f48d443778c..9bfa7d1c002 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMat.java @@ -28,7 +28,7 @@ public class CvSparseMat extends AbstractCvSparseMat { return (CvSparseMat)super.position(position); } @Override public CvSparseMat getPointer(long i) { - return new CvSparseMat((Pointer)this).position(position + i); + return new CvSparseMat((Pointer)this).offsetAddress(i); } public native int type(); public native CvSparseMat type(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java index 99c34096d61..a9d2e3c9959 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseMatIterator.java @@ -28,7 +28,7 @@ public class CvSparseMatIterator extends Pointer { return (CvSparseMatIterator)super.position(position); } @Override public CvSparseMatIterator getPointer(long i) { - return new CvSparseMatIterator((Pointer)this).position(position + i); + return new CvSparseMatIterator((Pointer)this).offsetAddress(i); } public native CvSparseMat mat(); public native CvSparseMatIterator mat(CvSparseMat setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java index ef105e9c4c3..86a56d425fb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvSparseNode.java @@ -30,7 +30,7 @@ public class CvSparseNode extends Pointer { return (CvSparseNode)super.position(position); } @Override public CvSparseNode getPointer(long i) { - return new CvSparseNode((Pointer)this).position(position + i); + return new CvSparseNode((Pointer)this).offsetAddress(i); } public native @Cast("unsigned") int hashval(); public native CvSparseNode hashval(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java index 52efb4254a0..c64c662f8be 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTermCriteria.java @@ -30,7 +30,7 @@ public class CvTermCriteria extends Pointer { return (CvTermCriteria)super.position(position); } @Override public CvTermCriteria getPointer(long i) { - return new CvTermCriteria((Pointer)this).position(position + i); + return new CvTermCriteria((Pointer)this).offsetAddress(i); } /** may be combination of diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java index 0e5433c9d04..b717c09eea6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvTreeNodeIterator.java @@ -30,7 +30,7 @@ public class CvTreeNodeIterator extends Pointer { return (CvTreeNodeIterator)super.position(position); } @Override public CvTreeNodeIterator getPointer(long i) { - return new CvTreeNodeIterator((Pointer)this).position(position + i); + return new CvTreeNodeIterator((Pointer)this).offsetAddress(i); } public native @Const Pointer node(); public native CvTreeNodeIterator node(Pointer setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java index 1031ef3841a..114a3dfe57d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/DMatch.java @@ -34,7 +34,7 @@ public class DMatch extends Pointer { return (DMatch)super.position(position); } @Override public DMatch getPointer(long i) { - return new DMatch((Pointer)this).position(position + i); + return new DMatch((Pointer)this).offsetAddress(i); } public DMatch() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java index e501ca5fca5..760b8ae76b9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Device.java @@ -23,7 +23,7 @@ public class Device extends Pointer { return (Device)super.position(position); } @Override public Device getPointer(long i) { - return new Device((Pointer)this).position(position + i); + return new Device((Pointer)this).offsetAddress(i); } public Device() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java index d079d5fe2ae..742f14828e0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNode.java @@ -37,7 +37,7 @@ public class FileNode extends Pointer { return (FileNode)super.position(position); } @Override public FileNode getPointer(long i) { - return new FileNode((Pointer)this).position(position + i); + return new FileNode((Pointer)this).offsetAddress(i); } /** type of the file storage node */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java index 67e8fb056f8..269263b189a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileNodeIterator.java @@ -31,7 +31,7 @@ public class FileNodeIterator extends Pointer { return (FileNodeIterator)super.position(position); } @Override public FileNodeIterator getPointer(long i) { - return new FileNodeIterator((Pointer)this).position(position + i); + return new FileNodeIterator((Pointer)this).offsetAddress(i); } /** \brief The constructors. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java index 091de957e1c..0f260cd23a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/FileStorage.java @@ -28,7 +28,7 @@ public class FileStorage extends Pointer { return (FileStorage)super.position(position); } @Override public FileStorage getPointer(long i) { - return new FileStorage((Pointer)this).position(position + i); + return new FileStorage((Pointer)this).offsetAddress(i); } /** file storage mode */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java index c37e6491a4e..a4678b7f662 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMat.java @@ -63,7 +63,7 @@ public class GpuMat extends Pointer { return (GpuMat)super.position(position); } @Override public GpuMat getPointer(long i) { - return new GpuMat((Pointer)this).position(position + i); + return new GpuMat((Pointer)this).offsetAddress(i); } public static class Allocator extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java index 7d5e21d9f8f..d0fdbf77393 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/GpuMatND.java @@ -25,7 +25,7 @@ public class GpuMatND extends Pointer { return (GpuMatND)super.position(position); } @Override public GpuMatND getPointer(long i) { - return new GpuMatND((Pointer)this).position(position + i); + return new GpuMatND((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java index 4da5dc17976..57c597d9a2b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Hamming.java @@ -33,7 +33,7 @@ public class Hamming extends Pointer { return (Hamming)super.position(position); } @Override public Hamming getPointer(long i) { - return new Hamming((Pointer)this).position(position + i); + return new Hamming((Pointer)this).offsetAddress(i); } @MemberGetter public static native @Cast("const cv::NormTypes") int normType(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java index 5f653375941..46a16665d1b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Image2D.java @@ -25,7 +25,7 @@ public class Image2D extends Pointer { return (Image2D)super.position(position); } @Override public Image2D getPointer(long i) { - return new Image2D((Pointer)this).position(position + i); + return new Image2D((Pointer)this).offsetAddress(i); } public Image2D() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java index 2b17c7c4980..bb97b943aae 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/InstrNode.java @@ -29,7 +29,7 @@ public class InstrNode extends Pointer { return (InstrNode)super.position(position); } @Override public InstrNode getPointer(long i) { - return new InstrNode((Pointer)this).position(position + i); + return new InstrNode((Pointer)this).offsetAddress(i); } public InstrNode() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java index 86597560d60..9e378a0b6cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IntDoubleMap.java @@ -27,6 +27,7 @@ public class IntDoubleMap extends Pointer { @Index public native double get(int i); public native IntDoubleMap put(int i, double value); + public native void erase(@ByVal Iterator pos); public native @ByVal Iterator begin(); public native @ByVal Iterator end(); @NoOffset @Name("iterator") public static class Iterator extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java index 23e78f51ff8..3c37616e389 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernel.java @@ -28,7 +28,7 @@ public class IplConvKernel extends org.bytedeco.opencv.opencv_imgproc.AbstractIp return (IplConvKernel)super.position(position); } @Override public IplConvKernel getPointer(long i) { - return new IplConvKernel((Pointer)this).position(position + i); + return new IplConvKernel((Pointer)this).offsetAddress(i); } public native int nCols(); public native IplConvKernel nCols(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java index 4fc0e12677e..e6feea0bc9d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplConvKernelFP.java @@ -28,7 +28,7 @@ public class IplConvKernelFP extends Pointer { return (IplConvKernelFP)super.position(position); } @Override public IplConvKernelFP getPointer(long i) { - return new IplConvKernelFP((Pointer)this).position(position + i); + return new IplConvKernelFP((Pointer)this).offsetAddress(i); } public native int nCols(); public native IplConvKernelFP nCols(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java index 85cc0f1561b..07f3cdbe7a8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplImage.java @@ -37,7 +37,7 @@ public class IplImage extends AbstractIplImage { return (IplImage)super.position(position); } @Override public IplImage getPointer(long i) { - return new IplImage((Pointer)this).position(position + i); + return new IplImage((Pointer)this).offsetAddress(i); } /** sizeof(IplImage) */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java index 069cb6ddedd..7dbf096cf72 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/IplROI.java @@ -28,7 +28,7 @@ public class IplROI extends Pointer { return (IplROI)super.position(position); } @Override public IplROI getPointer(long i) { - return new IplROI((Pointer)this).position(position + i); + return new IplROI((Pointer)this).offsetAddress(i); } /** 0 - no COI (all channels are selected), 1 - 0th channel is selected ...*/ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java index a0927dd67ed..5a27827c739 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Kernel.java @@ -26,7 +26,7 @@ public class Kernel extends Pointer { return (Kernel)super.position(position); } @Override public Kernel getPointer(long i) { - return new Kernel((Pointer)this).position(position + i); + return new Kernel((Pointer)this).offsetAddress(i); } public Kernel() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java index a47c15bf38c..7b4981e2e78 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KernelArg.java @@ -26,7 +26,7 @@ public class KernelArg extends Pointer { return (KernelArg)super.position(position); } @Override public KernelArg getPointer(long i) { - return new KernelArg((Pointer)this).position(position + i); + return new KernelArg((Pointer)this).offsetAddress(i); } /** enum cv::ocl::KernelArg:: */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java index 42ba1843ec0..47c18340e90 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/KeyPoint.java @@ -39,7 +39,7 @@ public class KeyPoint extends Pointer { return (KeyPoint)super.position(position); } @Override public KeyPoint getPointer(long i) { - return new KeyPoint((Pointer)this).position(position + i); + return new KeyPoint((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java index 4f0ff1fbb4d..bfdd63c4273 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Mat.java @@ -220,7 +220,7 @@ public class Mat extends AbstractMat { return (Mat)super.position(position); } @Override public Mat getPointer(long i) { - return new Mat((Pointer)this).position(position + i); + return new Mat((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java index 70a468b822c..969b1dc5de8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatConstIterator.java @@ -29,7 +29,7 @@ public class MatConstIterator extends Pointer { return (MatConstIterator)super.position(position); } @Override public MatConstIterator getPointer(long i) { - return new MatConstIterator((Pointer)this).position(position + i); + return new MatConstIterator((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java index 00997100a62..105d8086ad9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MatExpr.java @@ -71,7 +71,7 @@ public class MatExpr extends Pointer { return (MatExpr)super.position(position); } @Override public MatExpr getPointer(long i) { - return new MatExpr((Pointer)this).position(position + i); + return new MatExpr((Pointer)this).offsetAddress(i); } public MatExpr() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java index af6f38b5906..87f3a01270f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java @@ -43,7 +43,7 @@ public static class Function extends Pointer { return (Function)super.position(position); } @Override public Function getPointer(long i) { - return new Function((Pointer)this).position(position + i); + return new Function((Pointer)this).offsetAddress(i); } @Virtual(true) public native @Const({false, false, true}) int getDims(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java index f739ba5ca0c..9197b7e2ac5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Moments.java @@ -65,7 +65,7 @@ public class Moments extends Pointer { return (Moments)super.position(position); } @Override public Moments getPointer(long i) { - return new Moments((Pointer)this).position(position + i); + return new Moments((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java index c9c21446d8d..3591d53ad26 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NAryMatIterator.java @@ -89,7 +89,7 @@ public class NAryMatIterator extends Pointer { return (NAryMatIterator)super.position(position); } @Override public NAryMatIterator getPointer(long i) { - return new NAryMatIterator((Pointer)this).position(position + i); + return new NAryMatIterator((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java index a22c5ef56a7..785d2b8168d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeData.java @@ -25,7 +25,7 @@ public class NodeData extends Pointer { return (NodeData)super.position(position); } @Override public NodeData getPointer(long i) { - return new NodeData((Pointer)this).position(position + i); + return new NodeData((Pointer)this).offsetAddress(i); } public NodeData(@Cast("const char*") BytePointer funName/*=0*/, @Cast("const char*") BytePointer fileName/*=NULL*/, int lineNum/*=0*/, Pointer retAddress/*=NULL*/, @Cast("bool") boolean alwaysExpand/*=false*/, @Cast("cv::instr::TYPE") int instrType/*=cv::instr::TYPE_GENERAL*/, @Cast("cv::instr::IMPL") int implType/*=cv::instr::IMPL_PLAIN*/) { super((Pointer)null); allocate(funName, fileName, lineNum, retAddress, alwaysExpand, instrType, implType); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java index f041f1cfc8c..e7a1b7bfa0e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTls.java @@ -25,7 +25,7 @@ public class NodeDataTls extends Pointer { return (NodeDataTls)super.position(position); } @Override public NodeDataTls getPointer(long i) { - return new NodeDataTls((Pointer)this).position(position + i); + return new NodeDataTls((Pointer)this).offsetAddress(i); } public NodeDataTls() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java index 97d3c98ac22..f429dffc2e2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/NodeDataTlsData.java @@ -30,7 +30,7 @@ public class NodeDataTlsData extends Pointer { return (NodeDataTlsData)super.position(position); } @Override public NodeDataTlsData getPointer(long i) { - return new NodeDataTlsData((Pointer)this).position(position + i); + return new NodeDataTlsData((Pointer)this).offsetAddress(i); } public NodeDataTlsData() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java index f1fc620607f..7d06d5494c9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OclPlatform.java @@ -26,7 +26,7 @@ public class OclPlatform extends Pointer { return (OclPlatform)super.position(position); } @Override public OclPlatform getPointer(long i) { - return new OclPlatform((Pointer)this).position(position + i); + return new OclPlatform((Pointer)this).offsetAddress(i); } public OclPlatform() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java index decedd7832f..76b092b6cc4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/OpenCLExecutionContext.java @@ -26,7 +26,7 @@ public class OpenCLExecutionContext extends Pointer { return (OpenCLExecutionContext)super.position(position); } @Override public OpenCLExecutionContext getPointer(long i) { - return new OpenCLExecutionContext((Pointer)this).position(position + i); + return new OpenCLExecutionContext((Pointer)this).offsetAddress(i); } public OpenCLExecutionContext() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java index 8d9857f014b..2ef43060485 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PCA.java @@ -90,7 +90,7 @@ public class PCA extends Pointer { return (PCA)super.position(position); } @Override public PCA getPointer(long i) { - return new PCA((Pointer)this).position(position + i); + return new PCA((Pointer)this).offsetAddress(i); } /** enum cv::PCA::Flags */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java index 2d728194c09..2e1d092fbea 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/PlatformInfo.java @@ -23,7 +23,7 @@ public class PlatformInfo extends Pointer { return (PlatformInfo)super.position(position); } @Override public PlatformInfo getPointer(long i) { - return new PlatformInfo((Pointer)this).position(position + i); + return new PlatformInfo((Pointer)this).offsetAddress(i); } public PlatformInfo() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java index 548208f860e..644380e230b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point.java @@ -63,7 +63,7 @@ public class Point extends IntPointer { return (Point)super.position(position); } @Override public Point getPointer(long i) { - return new Point((Pointer)this).position(position + i); + return new Point((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java index 7fea926d432..40ac1ff730d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2d.java @@ -24,7 +24,7 @@ public class Point2d extends DoublePointer { return (Point2d)super.position(position); } @Override public Point2d getPointer(long i) { - return new Point2d((Pointer)this).position(position + i); + return new Point2d((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java index 5d381d6a51e..dc9b74da4e7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point2f.java @@ -24,7 +24,7 @@ public class Point2f extends FloatPointer { return (Point2f)super.position(position); } @Override public Point2f getPointer(long i) { - return new Point2f((Pointer)this).position(position + i); + return new Point2f((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java index e5a42a88f5b..531b01dcde4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3d.java @@ -24,7 +24,7 @@ public class Point3d extends DoublePointer { return (Point3d)super.position(position); } @Override public Point3d getPointer(long i) { - return new Point3d((Pointer)this).position(position + i); + return new Point3d((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java index d914a6e560b..603e69f6839 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3f.java @@ -24,7 +24,7 @@ public class Point3f extends FloatPointer { return (Point3f)super.position(position); } @Override public Point3f getPointer(long i) { - return new Point3f((Pointer)this).position(position + i); + return new Point3f((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java index 5561acc66c3..87dd78cc102 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Point3i.java @@ -42,7 +42,7 @@ public class Point3i extends IntPointer { return (Point3i)super.position(position); } @Override public Point3i getPointer(long i) { - return new Point3i((Pointer)this).position(position + i); + return new Point3i((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java index aacbe200acc..e05b23aeddb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Program.java @@ -25,7 +25,7 @@ public class Program extends Pointer { return (Program)super.position(position); } @Override public Program getPointer(long i) { - return new Program((Pointer)this).position(position + i); + return new Program((Pointer)this).offsetAddress(i); } public Program() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java index d60b12e550f..19dd665c99f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/ProgramSource.java @@ -26,7 +26,7 @@ public class ProgramSource extends Pointer { return (ProgramSource)super.position(position); } @Override public ProgramSource getPointer(long i) { - return new ProgramSource((Pointer)this).position(position + i); + return new ProgramSource((Pointer)this).offsetAddress(i); } // deprecated diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java index 88d613d7001..a89604776e1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Queue.java @@ -25,7 +25,7 @@ public class Queue extends Pointer { return (Queue)super.position(position); } @Override public Queue getPointer(long i) { - return new Queue((Pointer)this).position(position + i); + return new Queue((Pointer)this).offsetAddress(i); } public Queue() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java index ccb97f1884b..aaa861484f1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Range.java @@ -51,7 +51,7 @@ public class Range extends Pointer { return (Range)super.position(position); } @Override public Range getPointer(long i) { - return new Range((Pointer)this).position(position + i); + return new Range((Pointer)this).offsetAddress(i); } public Range() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java index a9932746ddf..19789c13778 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect.java @@ -70,7 +70,7 @@ public class Rect extends IntPointer { return (Rect)super.position(position); } @Override public Rect getPointer(long i) { - return new Rect((Pointer)this).position(position + i); + return new Rect((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java index df9204a8544..f14d70f02aa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2d.java @@ -24,7 +24,7 @@ public class Rect2d extends DoublePointer { return (Rect2d)super.position(position); } @Override public Rect2d getPointer(long i) { - return new Rect2d((Pointer)this).position(position + i); + return new Rect2d((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java index 7c473faee4e..b8d2c83185f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Rect2f.java @@ -24,7 +24,7 @@ public class Rect2f extends FloatPointer { return (Rect2f)super.position(position); } @Override public Rect2f getPointer(long i) { - return new Rect2f((Pointer)this).position(position + i); + return new Rect2f((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java index b35b7b6048b..bc787ea0fa5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/RotatedRect.java @@ -38,7 +38,7 @@ public class RotatedRect extends FloatPointer { return (RotatedRect)super.position(position); } @Override public RotatedRect getPointer(long i) { - return new RotatedRect((Pointer)this).position(position + i); + return new RotatedRect((Pointer)this).offsetAddress(i); } /** default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java index 7fa8121a039..c71e3dccbef 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SVD.java @@ -39,7 +39,7 @@ public class SVD extends Pointer { return (SVD)super.position(position); } @Override public SVD getPointer(long i) { - return new SVD((Pointer)this).position(position + i); + return new SVD((Pointer)this).offsetAddress(i); } /** enum cv::SVD::Flags */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java index 9d0f4e96b4f..fecc089ed13 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size.java @@ -40,7 +40,7 @@ public class Size extends IntPointer { return (Size)super.position(position); } @Override public Size getPointer(long i) { - return new Size((Pointer)this).position(position + i); + return new Size((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java index d5db593978e..54c2f992418 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2d.java @@ -24,7 +24,7 @@ public class Size2d extends DoublePointer { return (Size2d)super.position(position); } @Override public Size2d getPointer(long i) { - return new Size2d((Pointer)this).position(position + i); + return new Size2d((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java index b7b53ec5b6f..a49438f9d52 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Size2f.java @@ -24,7 +24,7 @@ public class Size2f extends FloatPointer { return (Size2f)super.position(position); } @Override public Size2f getPointer(long i) { - return new Size2f((Pointer)this).position(position + i); + return new Size2f((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java index 3b5fc0b2f84..d414a85adbd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMat.java @@ -107,7 +107,7 @@ public class SparseMat extends Pointer { return (SparseMat)super.position(position); } @Override public SparseMat getPointer(long i) { - return new SparseMat((Pointer)this).position(position + i); + return new SparseMat((Pointer)this).offsetAddress(i); } @@ -154,7 +154,7 @@ public static class Node extends Pointer { return (Node)super.position(position); } @Override public Node getPointer(long i) { - return new Node((Pointer)this).position(position + i); + return new Node((Pointer)this).offsetAddress(i); } /** hash value */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java index a526f43f700..ab3235de9ad 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatConstIterator.java @@ -41,7 +41,7 @@ public class SparseMatConstIterator extends Pointer { return (SparseMatConstIterator)super.position(position); } @Override public SparseMatConstIterator getPointer(long i) { - return new SparseMatConstIterator((Pointer)this).position(position + i); + return new SparseMatConstIterator((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java index 4d246d0ed68..b6c507babf7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/SparseMatIterator.java @@ -34,7 +34,7 @@ public class SparseMatIterator extends SparseMatConstIterator { return (SparseMatIterator)super.position(position); } @Override public SparseMatIterator getPointer(long i) { - return new SparseMatIterator((Pointer)this).position(position + i); + return new SparseMatIterator((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java index 5358ff4a4dd..2f5f8cf17a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TargetArchs.java @@ -34,7 +34,7 @@ public class TargetArchs extends Pointer { return (TargetArchs)super.position(position); } @Override public TargetArchs getPointer(long i) { - return new TargetArchs((Pointer)this).position(position + i); + return new TargetArchs((Pointer)this).offsetAddress(i); } /** \brief The following method checks whether the module was built with the support of the given feature: diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java index 6fe28a834e5..f28942a87ca 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TermCriteria.java @@ -34,7 +34,7 @@ public class TermCriteria extends Pointer { return (TermCriteria)super.position(position); } @Override public TermCriteria getPointer(long i) { - return new TermCriteria((Pointer)this).position(position + i); + return new TermCriteria((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java index a0559d76013..ed2054d94a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/TickMeter.java @@ -36,7 +36,7 @@ public class TickMeter extends Pointer { return (TickMeter)super.position(position); } @Override public TickMeter getPointer(long i) { - return new TickMeter((Pointer)this).position(position + i); + return new TickMeter((Pointer)this).offsetAddress(i); } /** the default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java index 912cab7315e..001dcef4ae8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/AccumLayer.java @@ -32,7 +32,7 @@ public class AccumLayer extends Layer { return (AccumLayer)super.position(position); } @Override public AccumLayer getPointer(long i) { - return new AccumLayer((Pointer)this).position(position + i); + return new AccumLayer((Pointer)this).offsetAddress(i); } public static native @Ptr AccumLayer create(@Const @ByRef LayerParams params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java index 0a8a0829d14..7acad30d535 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/ConstLayer.java @@ -35,7 +35,7 @@ public class ConstLayer extends Layer { return (ConstLayer)super.position(position); } @Override public ConstLayer getPointer(long i) { - return new ConstLayer((Pointer)this).position(position + i); + return new ConstLayer((Pointer)this).offsetAddress(i); } public static native @Ptr Layer create(@Const @ByRef LayerParams params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java index 2216de3929b..720c50e74e0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/CorrelationLayer.java @@ -32,7 +32,7 @@ public class CorrelationLayer extends Layer { return (CorrelationLayer)super.position(position); } @Override public CorrelationLayer getPointer(long i) { - return new CorrelationLayer((Pointer)this).position(position + i); + return new CorrelationLayer((Pointer)this).offsetAddress(i); } public static native @Ptr CorrelationLayer create(@Const @ByRef LayerParams params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java index 0bd18704574..282c09a18db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DataAugmentationLayer.java @@ -32,7 +32,7 @@ public class DataAugmentationLayer extends Layer { return (DataAugmentationLayer)super.position(position); } @Override public DataAugmentationLayer getPointer(long i) { - return new DataAugmentationLayer((Pointer)this).position(position + i); + return new DataAugmentationLayer((Pointer)this).offsetAddress(i); } public static native @Ptr DataAugmentationLayer create(@Const @ByRef LayerParams params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java index d1768acf3db..2735c5f858f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/DetectionModel.java @@ -36,7 +36,7 @@ public class DetectionModel extends Model { return (DetectionModel)super.position(position); } @Override public DetectionModel getPointer(long i) { - return new DetectionModel((Pointer)this).position(position + i); + return new DetectionModel((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java index edf10b38002..ec5d3f2ccf8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Dict.java @@ -33,7 +33,7 @@ public class Dict extends Pointer { return (Dict)super.position(position); } @Override public Dict getPointer(long i) { - return new Dict((Pointer)this).position(position + i); + return new Dict((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java index 3c4571b8b9f..c93599a71fe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/FlowWarpLayer.java @@ -32,7 +32,7 @@ public class FlowWarpLayer extends Layer { return (FlowWarpLayer)super.position(position); } @Override public FlowWarpLayer getPointer(long i) { - return new FlowWarpLayer((Pointer)this).position(position + i); + return new FlowWarpLayer((Pointer)this).offsetAddress(i); } public static native @Ptr FlowWarpLayer create(@Const @ByRef LayerParams params); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java index af2584e8b6f..c6f17546a1c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java @@ -34,7 +34,7 @@ public class Layer extends Algorithm { return (Layer)super.position(position); } @Override public Layer getPointer(long i) { - return new Layer((Pointer)this).position(position + i); + return new Layer((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java index a1fe2f677ad..a15ac21c3ab 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/LayerParams.java @@ -37,7 +37,7 @@ public class LayerParams extends Dict { return (LayerParams)super.position(position); } @Override public LayerParams getPointer(long i) { - return new LayerParams((Pointer)this).position(position + i); + return new LayerParams((Pointer)this).offsetAddress(i); } //TODO: Add ability to name blob params diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java index f9ea49534fb..9f7eb5bf3ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Model.java @@ -36,7 +36,7 @@ public class Model extends Pointer { return (Model)super.position(position); } @Override public Model getPointer(long i) { - return new Model((Pointer)this).position(position + i); + return new Model((Pointer)this).offsetAddress(i); } public Model() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java index 70c2360c956..5dbffff64f6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Net.java @@ -39,7 +39,7 @@ public class Net extends Pointer { return (Net)super.position(position); } @Override public Net getPointer(long i) { - return new Net((Pointer)this).position(position + i); + return new Net((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java index 8357d96d8d4..64e5c32ca48 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_DB.java @@ -41,7 +41,7 @@ public class TextDetectionModel_DB extends TextDetectionModel { return (TextDetectionModel_DB)super.position(position); } @Override public TextDetectionModel_DB getPointer(long i) { - return new TextDetectionModel_DB((Pointer)this).position(position + i); + return new TextDetectionModel_DB((Pointer)this).offsetAddress(i); } public TextDetectionModel_DB() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java index e5030272947..353b3ac54b7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextDetectionModel_EAST.java @@ -35,7 +35,7 @@ public class TextDetectionModel_EAST extends TextDetectionModel { return (TextDetectionModel_EAST)super.position(position); } @Override public TextDetectionModel_EAST getPointer(long i) { - return new TextDetectionModel_EAST((Pointer)this).position(position + i); + return new TextDetectionModel_EAST((Pointer)this).offsetAddress(i); } public TextDetectionModel_EAST() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java index 0948e7afa4a..787e70dd399 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/TextRecognitionModel.java @@ -37,7 +37,7 @@ public class TextRecognitionModel extends Model { return (TextRecognitionModel)super.position(position); } @Override public TextRecognitionModel getPointer(long i) { - return new TextRecognitionModel((Pointer)this).position(position + i); + return new TextRecognitionModel((Pointer)this).offsetAddress(i); } public TextRecognitionModel() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java index 145ec4bab2e..61c9b58806e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn_superres/DnnSuperResImpl.java @@ -47,7 +47,7 @@ public class DnnSuperResImpl extends Pointer { return (DnnSuperResImpl)super.position(position); } @Override public DnnSuperResImpl getPointer(long i) { - return new DnnSuperResImpl((Pointer)this).position(position + i); + return new DnnSuperResImpl((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java index 486a1b7bcb9..d03191f47a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkAAM.java @@ -52,7 +52,7 @@ public class FacemarkAAM extends FacemarkTrain { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } /** @@ -97,7 +97,7 @@ public class FacemarkAAM extends FacemarkTrain { return (Config)super.position(position); } @Override public Config getPointer(long i) { - return new Config((Pointer)this).position(position + i); + return new Config((Pointer)this).offsetAddress(i); } public Config( @ByVal(nullValue = "cv::Mat::eye(2,2,CV_32F)") Mat rot, @@ -139,7 +139,7 @@ public static class Data extends Pointer { return (Data)super.position(position); } @Override public Data getPointer(long i) { - return new Data((Pointer)this).position(position + i); + return new Data((Pointer)this).offsetAddress(i); } public native @ByRef Point2fVector s0(); public native Data s0(Point2fVector setter); @@ -162,7 +162,7 @@ public static class Model extends Pointer { return (Model)super.position(position); } @Override public Model getPointer(long i) { - return new Model((Pointer)this).position(position + i); + return new Model((Pointer)this).offsetAddress(i); } @@ -188,7 +188,7 @@ public static class Texture extends Pointer { return (Texture)super.position(position); } @Override public Texture getPointer(long i) { - return new Texture((Pointer)this).position(position + i); + return new Texture((Pointer)this).offsetAddress(i); } /** unused delete */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java index 78a401c490a..3f79164e2c0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkKazemi.java @@ -48,7 +48,7 @@ public class FacemarkKazemi extends Facemark { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java index ff3b40f3515..dfdad9c3aee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FacemarkLBF.java @@ -52,7 +52,7 @@ public class FacemarkLBF extends FacemarkTrain { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } /** @@ -124,7 +124,7 @@ public class FacemarkLBF extends FacemarkTrain { return (BBox)super.position(position); } @Override public BBox getPointer(long i) { - return new BBox((Pointer)this).position(position + i); + return new BBox((Pointer)this).offsetAddress(i); } public BBox() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java index eca5da06ea0..6e2c2d78250 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/StandardCollector.java @@ -53,7 +53,7 @@ public class StandardCollector extends PredictCollector { return (PredictResult)super.position(position); } @Override public PredictResult getPointer(long i) { - return new PredictResult((Pointer)this).position(position + i); + return new PredictResult((Pointer)this).offsetAddress(i); } public native int label(); public native PredictResult label(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java index 51178bc1960..10f18ea8f37 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java @@ -45,6 +45,6 @@ public class Accumulator extends Pointer { return (Accumulator)super.position(position); } @Override public Accumulator getPointer(long i) { - return new Accumulator((Pointer)this).position(position + i); + return new Accumulator((Pointer)this).offsetAddress(i); } } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java index 6175c2d7a72..889bf70497c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java @@ -42,7 +42,7 @@ public class BFMatcher extends DescriptorMatcher { return (BFMatcher)super.position(position); } @Override public BFMatcher getPointer(long i) { - return new BFMatcher((Pointer)this).position(position + i); + return new BFMatcher((Pointer)this).offsetAddress(i); } /** \brief Brute-force matcher constructor (obsolete). Please use BFMatcher.create() diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java index 3b8187b3adc..d0c6bcda536 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java @@ -42,7 +42,7 @@ public class BRISK extends Feature2D { return (BRISK)super.position(position); } @Override public BRISK getPointer(long i) { - return new BRISK((Pointer)this).position(position + i); + return new BRISK((Pointer)this).offsetAddress(i); } /** \brief The BRISK constructor diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java index fb3e68bdda4..8fdfcf3a015 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java @@ -46,7 +46,7 @@ public class Feature2D extends Algorithm { return (Feature2D)super.position(position); } @Override public Feature2D getPointer(long i) { - return new Feature2D((Pointer)this).position(position + i); + return new Feature2D((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java index b412b8ce04a..5a69a8fc0d1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java @@ -45,7 +45,7 @@ public class FlannBasedMatcher extends DescriptorMatcher { return (FlannBasedMatcher)super.position(position); } @Override public FlannBasedMatcher getPointer(long i) { - return new FlannBasedMatcher((Pointer)this).position(position + i); + return new FlannBasedMatcher((Pointer)this).offsetAddress(i); } public FlannBasedMatcher( @Ptr IndexParams indexParams/*=makePtr()*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java index 3e72c4ba259..e9dbbf47e94 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KeyPointsFilter.java @@ -49,7 +49,7 @@ public class KeyPointsFilter extends Pointer { return (KeyPointsFilter)super.position(position); } @Override public KeyPointsFilter getPointer(long i) { - return new KeyPointsFilter((Pointer)this).position(position + i); + return new KeyPointsFilter((Pointer)this).offsetAddress(i); } public KeyPointsFilter() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java index 2fd402adf7f..ceb00521d8d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java @@ -43,7 +43,7 @@ public class SIFT extends Feature2D { return (SIFT)super.position(position); } @Override public SIFT getPointer(long i) { - return new SIFT((Pointer)this).position(position + i); + return new SIFT((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java index aa0cf73611d..207bf8d0610 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java @@ -70,7 +70,7 @@ public class SimpleBlobDetector extends Feature2D { return (SimpleBlobDetector)super.position(position); } @Override public SimpleBlobDetector getPointer(long i) { - return new SimpleBlobDetector((Pointer)this).position(position + i); + return new SimpleBlobDetector((Pointer)this).offsetAddress(i); } @NoOffset public static class Params extends Pointer { @@ -84,7 +84,7 @@ public class SimpleBlobDetector extends Feature2D { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java index 1b046a80377..70720bc2db8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/AutotunedIndexParams.java @@ -27,7 +27,7 @@ public class AutotunedIndexParams extends IndexParams { return (AutotunedIndexParams)super.position(position); } @Override public AutotunedIndexParams getPointer(long i) { - return new AutotunedIndexParams((Pointer)this).position(position + i); + return new AutotunedIndexParams((Pointer)this).offsetAddress(i); } public AutotunedIndexParams(float target_precision/*=0.8f*/, float build_weight/*=0.01f*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java index 55cccc34cf9..e31bf3bceeb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/CompositeIndexParams.java @@ -27,7 +27,7 @@ public class CompositeIndexParams extends IndexParams { return (CompositeIndexParams)super.position(position); } @Override public CompositeIndexParams getPointer(long i) { - return new CompositeIndexParams((Pointer)this).position(position + i); + return new CompositeIndexParams((Pointer)this).offsetAddress(i); } public CompositeIndexParams(int trees/*=4*/, int branching/*=32*/, int iterations/*=11*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java index c4d79b23885..78135c765bd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/HierarchicalClusteringIndexParams.java @@ -27,7 +27,7 @@ public class HierarchicalClusteringIndexParams extends IndexParams { return (HierarchicalClusteringIndexParams)super.position(position); } @Override public HierarchicalClusteringIndexParams getPointer(long i) { - return new HierarchicalClusteringIndexParams((Pointer)this).position(position + i); + return new HierarchicalClusteringIndexParams((Pointer)this).offsetAddress(i); } public HierarchicalClusteringIndexParams(int branching/*=32*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java index abbe1502780..9985c37da74 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/Index.java @@ -27,7 +27,7 @@ public class Index extends Pointer { return (Index)super.position(position); } @Override public Index getPointer(long i) { - return new Index((Pointer)this).position(position + i); + return new Index((Pointer)this).offsetAddress(i); } public Index() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java index 91339f5a34e..b235d7170da 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/IndexParams.java @@ -27,7 +27,7 @@ public class IndexParams extends Pointer { return (IndexParams)super.position(position); } @Override public IndexParams getPointer(long i) { - return new IndexParams((Pointer)this).position(position + i); + return new IndexParams((Pointer)this).offsetAddress(i); } public IndexParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java index e9a3d0ceb60..6c6c6207774 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/KMeansIndexParams.java @@ -27,7 +27,7 @@ public class KMeansIndexParams extends IndexParams { return (KMeansIndexParams)super.position(position); } @Override public KMeansIndexParams getPointer(long i) { - return new KMeansIndexParams((Pointer)this).position(position + i); + return new KMeansIndexParams((Pointer)this).offsetAddress(i); } public KMeansIndexParams(int branching/*=32*/, int iterations/*=11*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java index 2fae58618f7..b8e1ce21cbd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/LinearIndexParams.java @@ -27,7 +27,7 @@ public class LinearIndexParams extends IndexParams { return (LinearIndexParams)super.position(position); } @Override public LinearIndexParams getPointer(long i) { - return new LinearIndexParams((Pointer)this).position(position + i); + return new LinearIndexParams((Pointer)this).offsetAddress(i); } public LinearIndexParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java index 78fffa333a2..3fc8a230d65 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_flann/SearchParams.java @@ -27,7 +27,7 @@ public class SearchParams extends IndexParams { return (SearchParams)super.position(position); } @Override public SearchParams getPointer(long i) { - return new SearchParams((Pointer)this).position(position + i); + return new SearchParams((Pointer)this).offsetAddress(i); } public SearchParams( int checks, float eps, @Cast("bool") boolean sorted, @Cast("bool") boolean explore_all_trees ) { super((Pointer)null); allocate(checks, eps, sorted, explore_all_trees); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java index 1a9d011a68e..b9e8e73868f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_highgui/QtFont.java @@ -42,7 +42,7 @@ public class QtFont extends Pointer { return (QtFont)super.position(position); } @Override public QtFont getPointer(long i) { - return new QtFont((Pointer)this).position(position + i); + return new QtFont((Pointer)this).offsetAddress(i); } /** Name of the font */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java index 627cc40199c..09705e632b3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvChainPtReader.java @@ -31,7 +31,7 @@ public class CvChainPtReader extends CvSeqReader { return (CvChainPtReader)super.position(position); } @Override public CvChainPtReader getPointer(long i) { - return new CvChainPtReader((Pointer)this).position(position + i); + return new CvChainPtReader((Pointer)this).offsetAddress(i); } public native int header_size(); public native CvChainPtReader header_size(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java index 7fe3269bb43..668828292fa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConnectedComp.java @@ -36,7 +36,7 @@ public class CvConnectedComp extends Pointer { return (CvConnectedComp)super.position(position); } @Override public CvConnectedComp getPointer(long i) { - return new CvConnectedComp((Pointer)this).position(position + i); + return new CvConnectedComp((Pointer)this).offsetAddress(i); } /**area of the connected component */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java index b9caac3f76d..9926174b463 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvConvexityDefect.java @@ -32,7 +32,7 @@ public class CvConvexityDefect extends Pointer { return (CvConvexityDefect)super.position(position); } @Override public CvConvexityDefect getPointer(long i) { - return new CvConvexityDefect((Pointer)this).position(position + i); + return new CvConvexityDefect((Pointer)this).offsetAddress(i); } /** point of the contour where the defect begins */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java index 665e364832d..5d91ce02299 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvFont.java @@ -32,7 +32,7 @@ public class CvFont extends AbstractCvFont { return (CvFont)super.position(position); } @Override public CvFont getPointer(long i) { - return new CvFont((Pointer)this).position(position + i); + return new CvFont((Pointer)this).offsetAddress(i); } public native @Cast("const char*") BytePointer nameFont(); public native CvFont nameFont(BytePointer setter); //Qt:nameFont diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java index a62cc58d980..8c8ccaf3f8d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvHuMoments.java @@ -32,7 +32,7 @@ public class CvHuMoments extends Pointer { return (CvHuMoments)super.position(position); } @Override public CvHuMoments getPointer(long i) { - return new CvHuMoments((Pointer)this).position(position + i); + return new CvHuMoments((Pointer)this).offsetAddress(i); } /** Hu invariants */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java index 387415b1eef..a2c51326f84 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CvMoments.java @@ -31,7 +31,7 @@ public class CvMoments extends AbstractCvMoments { return (CvMoments)super.position(position); } @Override public CvMoments getPointer(long i) { - return new CvMoments((Pointer)this).position(position + i); + return new CvMoments((Pointer)this).offsetAddress(i); } /** spatial moments */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java index d5697a6de5e..b936864c36f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/Subdiv2D.java @@ -32,7 +32,7 @@ public class Subdiv2D extends Pointer { return (Subdiv2D)super.position(position); } @Override public Subdiv2D getPointer(long i) { - return new Subdiv2D((Pointer)this).position(position + i); + return new Subdiv2D((Pointer)this).offsetAddress(i); } /** Subdiv2D point location cases */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java index f9979533384..29e870157e3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java @@ -147,7 +147,7 @@ specified, where the anomaly probability is artificially increased (up to 0.5 or return (Node)super.position(position); } @Override public Node getPointer(long i) { - return new Node((Pointer)this).position(position + i); + return new Node((Pointer)this).offsetAddress(i); } public Node() { super((Pointer)null); allocate(); } @@ -184,7 +184,7 @@ specified, where the anomaly probability is artificially increased (up to 0.5 or return (Split)super.position(position); } @Override public Split getPointer(long i) { - return new Split((Pointer)this).position(position + i); + return new Split((Pointer)this).offsetAddress(i); } public Split() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java index fbee734f2e4..6e360cd707e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ParamGrid.java @@ -32,7 +32,7 @@ public class ParamGrid extends Pointer { return (ParamGrid)super.position(position); } @Override public ParamGrid getPointer(long i) { - return new ParamGrid((Pointer)this).position(position + i); + return new ParamGrid((Pointer)this).offsetAddress(i); } /** \brief Default constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java index da64b2271c4..08101a53344 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CascadeClassifier.java @@ -46,7 +46,7 @@ public class CascadeClassifier extends Pointer { return (CascadeClassifier)super.position(position); } @Override public CascadeClassifier getPointer(long i) { - return new CascadeClassifier((Pointer)this).position(position + i); + return new CascadeClassifier((Pointer)this).offsetAddress(i); } public CascadeClassifier() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java index ceafb4c27b3..5878b048c0f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionBasedTracker.java @@ -48,7 +48,7 @@ public class DetectionBasedTracker extends Pointer { return (Parameters)super.position(position); } @Override public Parameters getPointer(long i) { - return new Parameters((Pointer)this).position(position + i); + return new Parameters((Pointer)this).offsetAddress(i); } public native int maxTrackLifetime(); public native Parameters maxTrackLifetime(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java index c4a5ddafc74..5ef807c55af 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/DetectionROI.java @@ -46,7 +46,7 @@ public class DetectionROI extends Pointer { return (DetectionROI)super.position(position); } @Override public DetectionROI getPointer(long i) { - return new DetectionROI((Pointer)this).position(position + i); + return new DetectionROI((Pointer)this).offsetAddress(i); } /** scale(size) of the bounding box */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java index d67245938f2..1d5a359de2a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/HOGDescriptor.java @@ -57,7 +57,7 @@ public class HOGDescriptor extends Pointer { return (HOGDescriptor)super.position(position); } @Override public HOGDescriptor getPointer(long i) { - return new HOGDescriptor((Pointer)this).position(position + i); + return new HOGDescriptor((Pointer)this).offsetAddress(i); } /** enum cv::HOGDescriptor::HistogramNormType */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java index 27078c19b36..0a2a917fbc5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/QRCodeDetector.java @@ -40,7 +40,7 @@ public class QRCodeDetector extends Pointer { return (QRCodeDetector)super.position(position); } @Override public QRCodeDetector getPointer(long i) { - return new QRCodeDetector((Pointer)this).position(position + i); + return new QRCodeDetector((Pointer)this).offsetAddress(i); } public QRCodeDetector() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java index 0c90436c509..1178f0ffece 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java @@ -56,7 +56,7 @@ public class HistogramPhaseUnwrapping extends PhaseUnwrapping { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java index 3addbc6f96c..2d4693fd91d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/MotionSaliencyBinWangApr2014.java @@ -52,7 +52,7 @@ public class MotionSaliencyBinWangApr2014 extends MotionSaliency { return (MotionSaliencyBinWangApr2014)super.position(position); } @Override public MotionSaliencyBinWangApr2014 getPointer(long i) { - return new MotionSaliencyBinWangApr2014((Pointer)this).position(position + i); + return new MotionSaliencyBinWangApr2014((Pointer)this).offsetAddress(i); } public MotionSaliencyBinWangApr2014() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java index f52bb74d969..b232f409ebd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/ObjectnessBING.java @@ -47,7 +47,7 @@ public class ObjectnessBING extends Objectness { return (ObjectnessBING)super.position(position); } @Override public ObjectnessBING getPointer(long i) { - return new ObjectnessBING((Pointer)this).position(position + i); + return new ObjectnessBING((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java index 46189ca3544..e36aeca2379 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencyFineGrained.java @@ -44,7 +44,7 @@ public class StaticSaliencyFineGrained extends StaticSaliency { return (StaticSaliencyFineGrained)super.position(position); } @Override public StaticSaliencyFineGrained getPointer(long i) { - return new StaticSaliencyFineGrained((Pointer)this).position(position + i); + return new StaticSaliencyFineGrained((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java index 9c2d92fe68d..2159c76c12c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/StaticSaliencySpectralResidual.java @@ -50,7 +50,7 @@ public class StaticSaliencySpectralResidual extends StaticSaliency { return (StaticSaliencySpectralResidual)super.position(position); } @Override public StaticSaliencySpectralResidual getPointer(long i) { - return new StaticSaliencySpectralResidual((Pointer)this).position(position + i); + return new StaticSaliencySpectralResidual((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java index 55acc4c63d3..b07ee992a38 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBasedEstimator.java @@ -59,7 +59,7 @@ public class AffineBasedEstimator extends Estimator { return (AffineBasedEstimator)super.position(position); } @Override public AffineBasedEstimator getPointer(long i) { - return new AffineBasedEstimator((Pointer)this).position(position + i); + return new AffineBasedEstimator((Pointer)this).offsetAddress(i); } public AffineBasedEstimator() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java index bc8bd78cee0..568d8d458c3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/AffineBestOf2NearestMatcher.java @@ -61,7 +61,7 @@ public class AffineBestOf2NearestMatcher extends BestOf2NearestMatcher { return (AffineBestOf2NearestMatcher)super.position(position); } @Override public AffineBestOf2NearestMatcher getPointer(long i) { - return new AffineBestOf2NearestMatcher((Pointer)this).position(position + i); + return new AffineBestOf2NearestMatcher((Pointer)this).offsetAddress(i); } /** \brief Constructs a "best of 2 nearest" matcher that expects affine transformation diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java index c667faeaeab..0cb7855657f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestMatcher.java @@ -57,7 +57,7 @@ public class BestOf2NearestMatcher extends FeaturesMatcher { return (BestOf2NearestMatcher)super.position(position); } @Override public BestOf2NearestMatcher getPointer(long i) { - return new BestOf2NearestMatcher((Pointer)this).position(position + i); + return new BestOf2NearestMatcher((Pointer)this).offsetAddress(i); } /** \brief Constructs a "best of 2 nearest" matcher. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java index a2eec1528db..786f8963913 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BestOf2NearestRangeMatcher.java @@ -52,7 +52,7 @@ public class BestOf2NearestRangeMatcher extends BestOf2NearestMatcher { return (BestOf2NearestRangeMatcher)super.position(position); } @Override public BestOf2NearestRangeMatcher getPointer(long i) { - return new BestOf2NearestRangeMatcher((Pointer)this).position(position + i); + return new BestOf2NearestRangeMatcher((Pointer)this).offsetAddress(i); } public BestOf2NearestRangeMatcher(int range_width/*=5*/, @Cast("bool") boolean try_use_gpu/*=false*/, float match_conf/*=0.3f*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java index ff86cac14dc..44c067cfb75 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Blender.java @@ -62,7 +62,7 @@ public class Blender extends Pointer { return (Blender)super.position(position); } @Override public Blender getPointer(long i) { - return new Blender((Pointer)this).position(position + i); + return new Blender((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java index 66b64a15c12..80932d5ed99 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksChannelsCompensator.java @@ -55,7 +55,7 @@ public class BlocksChannelsCompensator extends BlocksCompensator { return (BlocksChannelsCompensator)super.position(position); } @Override public BlocksChannelsCompensator getPointer(long i) { - return new BlocksChannelsCompensator((Pointer)this).position(position + i); + return new BlocksChannelsCompensator((Pointer)this).offsetAddress(i); } public BlocksChannelsCompensator(int bl_width/*=32*/, int bl_height/*=32*/, int nr_feeds/*=1*/) { super((Pointer)null); allocate(bl_width, bl_height, nr_feeds); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java index c3a7d1139a3..b20d1d91943 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BlocksGainCompensator.java @@ -55,7 +55,7 @@ public class BlocksGainCompensator extends BlocksCompensator { return (BlocksGainCompensator)super.position(position); } @Override public BlocksGainCompensator getPointer(long i) { - return new BlocksGainCompensator((Pointer)this).position(position + i); + return new BlocksGainCompensator((Pointer)this).offsetAddress(i); } // This Constructor only exists to make source level compatibility detector happy diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java index 5f55c6aa929..997ab20ffed 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffine.java @@ -62,7 +62,7 @@ public class BundleAdjusterAffine extends BundleAdjusterBase { return (BundleAdjusterAffine)super.position(position); } @Override public BundleAdjusterAffine getPointer(long i) { - return new BundleAdjusterAffine((Pointer)this).position(position + i); + return new BundleAdjusterAffine((Pointer)this).offsetAddress(i); } public BundleAdjusterAffine() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java index 29166015641..b8c7038dbd9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterAffinePartial.java @@ -62,7 +62,7 @@ public class BundleAdjusterAffinePartial extends BundleAdjusterBase { return (BundleAdjusterAffinePartial)super.position(position); } @Override public BundleAdjusterAffinePartial getPointer(long i) { - return new BundleAdjusterAffinePartial((Pointer)this).position(position + i); + return new BundleAdjusterAffinePartial((Pointer)this).offsetAddress(i); } public BundleAdjusterAffinePartial() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java index e27adbded54..6a127501cc3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterRay.java @@ -58,7 +58,7 @@ public class BundleAdjusterRay extends BundleAdjusterBase { return (BundleAdjusterRay)super.position(position); } @Override public BundleAdjusterRay getPointer(long i) { - return new BundleAdjusterRay((Pointer)this).position(position + i); + return new BundleAdjusterRay((Pointer)this).offsetAddress(i); } public BundleAdjusterRay() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java index 308139803a7..34573038469 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/BundleAdjusterReproj.java @@ -59,7 +59,7 @@ public class BundleAdjusterReproj extends BundleAdjusterBase { return (BundleAdjusterReproj)super.position(position); } @Override public BundleAdjusterReproj getPointer(long i) { - return new BundleAdjusterReproj((Pointer)this).position(position + i); + return new BundleAdjusterReproj((Pointer)this).offsetAddress(i); } public BundleAdjusterReproj() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java index 9c0fc7f57d3..3b5bfdacbfb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CameraParams.java @@ -59,7 +59,7 @@ public class CameraParams extends Pointer { return (CameraParams)super.position(position); } @Override public CameraParams getPointer(long i) { - return new CameraParams((Pointer)this).position(position + i); + return new CameraParams((Pointer)this).offsetAddress(i); } public CameraParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java index 41f205fd373..b957af03d01 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitProjector.java @@ -56,7 +56,7 @@ public class CompressedRectilinearPortraitProjector extends ProjectorBase { return (CompressedRectilinearPortraitProjector)super.position(position); } @Override public CompressedRectilinearPortraitProjector getPointer(long i) { - return new CompressedRectilinearPortraitProjector((Pointer)this).position(position + i); + return new CompressedRectilinearPortraitProjector((Pointer)this).offsetAddress(i); } public native float a(); public native CompressedRectilinearPortraitProjector a(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java index f34c1315237..a53f834b970 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearPortraitWarper.java @@ -52,7 +52,7 @@ public class CompressedRectilinearPortraitWarper extends WarperCreator { return (CompressedRectilinearPortraitWarper)super.position(position); } @Override public CompressedRectilinearPortraitWarper getPointer(long i) { - return new CompressedRectilinearPortraitWarper((Pointer)this).position(position + i); + return new CompressedRectilinearPortraitWarper((Pointer)this).offsetAddress(i); } public CompressedRectilinearPortraitWarper(float A/*=1*/, float B/*=1*/) { super((Pointer)null); allocate(A, B); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java index b7f6620bc2a..698025ae299 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearProjector.java @@ -56,7 +56,7 @@ public class CompressedRectilinearProjector extends ProjectorBase { return (CompressedRectilinearProjector)super.position(position); } @Override public CompressedRectilinearProjector getPointer(long i) { - return new CompressedRectilinearProjector((Pointer)this).position(position + i); + return new CompressedRectilinearProjector((Pointer)this).offsetAddress(i); } public native float a(); public native CompressedRectilinearProjector a(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java index d50aacf2f2a..e1390e2c250 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CompressedRectilinearWarper.java @@ -52,7 +52,7 @@ public class CompressedRectilinearWarper extends WarperCreator { return (CompressedRectilinearWarper)super.position(position); } @Override public CompressedRectilinearWarper getPointer(long i) { - return new CompressedRectilinearWarper((Pointer)this).position(position + i); + return new CompressedRectilinearWarper((Pointer)this).offsetAddress(i); } public CompressedRectilinearWarper(float A/*=1*/, float B/*=1*/) { super((Pointer)null); allocate(A, B); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java index 6b84fce4d8b..5a5c31e7ca4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalPortraitProjector.java @@ -55,7 +55,7 @@ public class CylindricalPortraitProjector extends ProjectorBase { return (CylindricalPortraitProjector)super.position(position); } @Override public CylindricalPortraitProjector getPointer(long i) { - return new CylindricalPortraitProjector((Pointer)this).position(position + i); + return new CylindricalPortraitProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java index d8155d51244..e6efed6b654 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalProjector.java @@ -56,7 +56,7 @@ public class CylindricalProjector extends ProjectorBase { return (CylindricalProjector)super.position(position); } @Override public CylindricalProjector getPointer(long i) { - return new CylindricalProjector((Pointer)this).position(position + i); + return new CylindricalProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java index b4a2b3b48e6..93bb934a277 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/CylindricalWarper.java @@ -58,7 +58,7 @@ public class CylindricalWarper extends WarperCreator { return (CylindricalWarper)super.position(position); } @Override public CylindricalWarper getPointer(long i) { - return new CylindricalWarper((Pointer)this).position(position + i); + return new CylindricalWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java index ec6aad85169..4928420b343 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeProjector.java @@ -56,7 +56,7 @@ public class FisheyeProjector extends ProjectorBase { return (FisheyeProjector)super.position(position); } @Override public FisheyeProjector getPointer(long i) { - return new FisheyeProjector((Pointer)this).position(position + i); + return new FisheyeProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java index 8dde5b2d816..0f0789d8e20 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/FisheyeWarper.java @@ -55,7 +55,7 @@ public class FisheyeWarper extends WarperCreator { return (FisheyeWarper)super.position(position); } @Override public FisheyeWarper getPointer(long i) { - return new FisheyeWarper((Pointer)this).position(position + i); + return new FisheyeWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java index 5a4f1eb52ce..5fe424dc5be 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinder.java @@ -54,7 +54,7 @@ public class GraphCutSeamFinder extends GraphCutSeamFinderBase { return (GraphCutSeamFinder)super.position(position); } @Override public GraphCutSeamFinder getPointer(long i) { - return new GraphCutSeamFinder((Pointer)this).position(position + i); + return new GraphCutSeamFinder((Pointer)this).offsetAddress(i); } public SeamFinder asSeamFinder() { return asSeamFinder(this); } @Namespace public static native @Name("static_cast") SeamFinder asSeamFinder(GraphCutSeamFinder pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java index 5efff9fe880..4b76b6a216a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/GraphCutSeamFinderBase.java @@ -57,7 +57,7 @@ public class GraphCutSeamFinderBase extends Pointer { return (GraphCutSeamFinderBase)super.position(position); } @Override public GraphCutSeamFinderBase getPointer(long i) { - return new GraphCutSeamFinderBase((Pointer)this).position(position + i); + return new GraphCutSeamFinderBase((Pointer)this).offsetAddress(i); } /** enum cv::detail::GraphCutSeamFinderBase::CostType */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java index 176cc260b05..a9f7e632b4a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/HomographyBasedEstimator.java @@ -54,7 +54,7 @@ public class HomographyBasedEstimator extends Estimator { return (HomographyBasedEstimator)super.position(position); } @Override public HomographyBasedEstimator getPointer(long i) { - return new HomographyBasedEstimator((Pointer)this).position(position + i); + return new HomographyBasedEstimator((Pointer)this).offsetAddress(i); } public HomographyBasedEstimator(@Cast("bool") boolean is_focals_estimated/*=false*/) { super((Pointer)null); allocate(is_focals_estimated); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java index 8e5fdae5b5a..f88221e8ac8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ImageFeatures.java @@ -59,7 +59,7 @@ public class ImageFeatures extends Pointer { return (ImageFeatures)super.position(position); } @Override public ImageFeatures getPointer(long i) { - return new ImageFeatures((Pointer)this).position(position + i); + return new ImageFeatures((Pointer)this).offsetAddress(i); } public native int img_idx(); public native ImageFeatures img_idx(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java index 7a0874c4ade..430ab4c4fd0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MatchesInfo.java @@ -59,7 +59,7 @@ public class MatchesInfo extends Pointer { return (MatchesInfo)super.position(position); } @Override public MatchesInfo getPointer(long i) { - return new MatchesInfo((Pointer)this).position(position + i); + return new MatchesInfo((Pointer)this).offsetAddress(i); } public MatchesInfo() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java index 296296dc830..89d05ab899f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorProjector.java @@ -56,7 +56,7 @@ public class MercatorProjector extends ProjectorBase { return (MercatorProjector)super.position(position); } @Override public MercatorProjector getPointer(long i) { - return new MercatorProjector((Pointer)this).position(position + i); + return new MercatorProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java index 1ccef051326..33114b9f383 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MercatorWarper.java @@ -55,7 +55,7 @@ public class MercatorWarper extends WarperCreator { return (MercatorWarper)super.position(position); } @Override public MercatorWarper getPointer(long i) { - return new MercatorWarper((Pointer)this).position(position + i); + return new MercatorWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java index 4839469c32b..260af3ccb60 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/MultiBandBlender.java @@ -54,7 +54,7 @@ public class MultiBandBlender extends Blender { return (MultiBandBlender)super.position(position); } @Override public MultiBandBlender getPointer(long i) { - return new MultiBandBlender((Pointer)this).position(position + i); + return new MultiBandBlender((Pointer)this).offsetAddress(i); } public MultiBandBlender(int try_gpu/*=false*/, int num_bands/*=5*/, int weight_type/*=CV_32F*/) { super((Pointer)null); allocate(try_gpu, num_bands, weight_type); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java index 0e158f682da..4a88f3046f9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoBundleAdjuster.java @@ -55,7 +55,7 @@ public class NoBundleAdjuster extends BundleAdjusterBase { return (NoBundleAdjuster)super.position(position); } @Override public NoBundleAdjuster getPointer(long i) { - return new NoBundleAdjuster((Pointer)this).position(position + i); + return new NoBundleAdjuster((Pointer)this).offsetAddress(i); } public NoBundleAdjuster() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java index 53a20aea82b..4f6767a1ec0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoExposureCompensator.java @@ -57,7 +57,7 @@ public class NoExposureCompensator extends ExposureCompensator { return (NoExposureCompensator)super.position(position); } @Override public NoExposureCompensator getPointer(long i) { - return new NoExposureCompensator((Pointer)this).position(position + i); + return new NoExposureCompensator((Pointer)this).offsetAddress(i); } public native void feed(@Const @ByRef PointVector arg0, @Const @ByRef UMatVector arg1, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java index c002d70f1d2..a1abe5dabf9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/NoSeamFinder.java @@ -57,7 +57,7 @@ public class NoSeamFinder extends SeamFinder { return (NoSeamFinder)super.position(position); } @Override public NoSeamFinder getPointer(long i) { - return new NoSeamFinder((Pointer)this).position(position + i); + return new NoSeamFinder((Pointer)this).offsetAddress(i); } public native void find(@Const @ByRef UMatVector arg0, @Const @ByRef PointVector arg1, @ByRef UMatVector arg2); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java index e8c08cf5fae..1536a4a0a67 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitProjector.java @@ -56,7 +56,7 @@ public class PaniniPortraitProjector extends ProjectorBase { return (PaniniPortraitProjector)super.position(position); } @Override public PaniniPortraitProjector getPointer(long i) { - return new PaniniPortraitProjector((Pointer)this).position(position + i); + return new PaniniPortraitProjector((Pointer)this).offsetAddress(i); } public native float a(); public native PaniniPortraitProjector a(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java index beedb8a0c3d..3379ff37d70 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniPortraitWarper.java @@ -52,7 +52,7 @@ public class PaniniPortraitWarper extends WarperCreator { return (PaniniPortraitWarper)super.position(position); } @Override public PaniniPortraitWarper getPointer(long i) { - return new PaniniPortraitWarper((Pointer)this).position(position + i); + return new PaniniPortraitWarper((Pointer)this).offsetAddress(i); } public PaniniPortraitWarper(float A/*=1*/, float B/*=1*/) { super((Pointer)null); allocate(A, B); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java index 12c6a59706c..af528f09a0a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniProjector.java @@ -56,7 +56,7 @@ public class PaniniProjector extends ProjectorBase { return (PaniniProjector)super.position(position); } @Override public PaniniProjector getPointer(long i) { - return new PaniniProjector((Pointer)this).position(position + i); + return new PaniniProjector((Pointer)this).offsetAddress(i); } public native float a(); public native PaniniProjector a(float setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java index 58ed1423ddc..0c04d97c8b2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PaniniWarper.java @@ -52,7 +52,7 @@ public class PaniniWarper extends WarperCreator { return (PaniniWarper)super.position(position); } @Override public PaniniWarper getPointer(long i) { - return new PaniniWarper((Pointer)this).position(position + i); + return new PaniniWarper((Pointer)this).offsetAddress(i); } public PaniniWarper(float A/*=1*/, float B/*=1*/) { super((Pointer)null); allocate(A, B); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java index 1c8a2809fca..3d1bb2fa4ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlanePortraitProjector.java @@ -55,7 +55,7 @@ public class PlanePortraitProjector extends ProjectorBase { return (PlanePortraitProjector)super.position(position); } @Override public PlanePortraitProjector getPointer(long i) { - return new PlanePortraitProjector((Pointer)this).position(position + i); + return new PlanePortraitProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java index e86ba24dd90..c28e2d7d364 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneProjector.java @@ -59,7 +59,7 @@ public class PlaneProjector extends ProjectorBase { return (PlaneProjector)super.position(position); } @Override public PlaneProjector getPointer(long i) { - return new PlaneProjector((Pointer)this).position(position + i); + return new PlaneProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java index d789a462e29..eba956c6b2c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PlaneWarper.java @@ -59,7 +59,7 @@ public class PlaneWarper extends WarperCreator { return (PlaneWarper)super.position(position); } @Override public PlaneWarper getPointer(long i) { - return new PlaneWarper((Pointer)this).position(position + i); + return new PlaneWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java index 19a2d9a21a1..2799e4d5a92 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/ProjectorBase.java @@ -57,7 +57,7 @@ public class ProjectorBase extends Pointer { return (ProjectorBase)super.position(position); } @Override public ProjectorBase getPointer(long i) { - return new ProjectorBase((Pointer)this).position(position + i); + return new ProjectorBase((Pointer)this).offsetAddress(i); } public native void setCameraParams(@ByVal(nullValue = "cv::InputArray(cv::Mat::eye(3, 3, CV_32F))") Mat K, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java index b023253719a..94e1c4c76f5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/PyRotationWarper.java @@ -51,7 +51,7 @@ public class PyRotationWarper extends Pointer { return (PyRotationWarper)super.position(position); } @Override public PyRotationWarper getPointer(long i) { - return new PyRotationWarper((Pointer)this).position(position + i); + return new PyRotationWarper((Pointer)this).offsetAddress(i); } public PyRotationWarper(@Str BytePointer type, float scale) { super((Pointer)null); allocate(type, scale); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java index ddf5555eeb2..a6f0e09dd73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalPortraitProjector.java @@ -56,7 +56,7 @@ public class SphericalPortraitProjector extends ProjectorBase { return (SphericalPortraitProjector)super.position(position); } @Override public SphericalPortraitProjector getPointer(long i) { - return new SphericalPortraitProjector((Pointer)this).position(position + i); + return new SphericalPortraitProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java index 0bab6d51f11..571fb398ebe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalProjector.java @@ -56,7 +56,7 @@ public class SphericalProjector extends ProjectorBase { return (SphericalProjector)super.position(position); } @Override public SphericalProjector getPointer(long i) { - return new SphericalProjector((Pointer)this).position(position + i); + return new SphericalProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java index 3da96cca4a6..db3d19fde12 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/SphericalWarper.java @@ -56,7 +56,7 @@ public class SphericalWarper extends WarperCreator { return (SphericalWarper)super.position(position); } @Override public SphericalWarper getPointer(long i) { - return new SphericalWarper((Pointer)this).position(position + i); + return new SphericalWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java index 2a28e23d752..915e18d1c05 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicProjector.java @@ -56,7 +56,7 @@ public class StereographicProjector extends ProjectorBase { return (StereographicProjector)super.position(position); } @Override public StereographicProjector getPointer(long i) { - return new StereographicProjector((Pointer)this).position(position + i); + return new StereographicProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java index d8186b0384a..5bca43edf1f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/StereographicWarper.java @@ -55,7 +55,7 @@ public class StereographicWarper extends WarperCreator { return (StereographicWarper)super.position(position); } @Override public StereographicWarper getPointer(long i) { - return new StereographicWarper((Pointer)this).position(position + i); + return new StereographicWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java index d332599d428..9a909e864c0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Stitcher.java @@ -84,7 +84,7 @@ public class Stitcher extends Pointer { return (Stitcher)super.position(position); } @Override public Stitcher getPointer(long i) { - return new Stitcher((Pointer)this).position(position + i); + return new Stitcher((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java index 51f3dfa1d43..86a15740d4f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/Timelapser.java @@ -60,7 +60,7 @@ public class Timelapser extends Pointer { return (Timelapser)super.position(position); } @Override public Timelapser getPointer(long i) { - return new Timelapser((Pointer)this).position(position + i); + return new Timelapser((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java index 105af31a35e..5f93468fb41 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TimelapserCrop.java @@ -56,7 +56,7 @@ public class TimelapserCrop extends Timelapser { return (TimelapserCrop)super.position(position); } @Override public TimelapserCrop getPointer(long i) { - return new TimelapserCrop((Pointer)this).position(position + i); + return new TimelapserCrop((Pointer)this).offsetAddress(i); } public native void initialize(@Const @ByRef PointVector corners, @Const @ByRef SizeVector sizes); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java index 2f956d84399..ffa0073c430 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorProjector.java @@ -56,7 +56,7 @@ public class TransverseMercatorProjector extends ProjectorBase { return (TransverseMercatorProjector)super.position(position); } @Override public TransverseMercatorProjector getPointer(long i) { - return new TransverseMercatorProjector((Pointer)this).position(position + i); + return new TransverseMercatorProjector((Pointer)this).offsetAddress(i); } public native void mapForward(float x, float y, @ByRef FloatPointer u, @ByRef FloatPointer v); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java index a7a3edab126..43f075fd2c7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/TransverseMercatorWarper.java @@ -55,7 +55,7 @@ public class TransverseMercatorWarper extends WarperCreator { return (TransverseMercatorWarper)super.position(position); } @Override public TransverseMercatorWarper getPointer(long i) { - return new TransverseMercatorWarper((Pointer)this).position(position + i); + return new TransverseMercatorWarper((Pointer)this).offsetAddress(i); } public native @Ptr RotationWarper create(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java index 256a078e72a..cfd7257cc33 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_stitching/VoronoiSeamFinder.java @@ -57,7 +57,7 @@ public class VoronoiSeamFinder extends PairwiseSeamFinder { return (VoronoiSeamFinder)super.position(position); } @Override public VoronoiSeamFinder getPointer(long i) { - return new VoronoiSeamFinder((Pointer)this).position(position + i); + return new VoronoiSeamFinder((Pointer)this).offsetAddress(i); } public native void find(@Const @ByRef UMatVector src, @Const @ByRef PointVector corners, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java index 038a76376c0..7b4afe3ee92 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/GrayCodePattern.java @@ -69,7 +69,7 @@ public class GrayCodePattern extends StructuredLightPattern { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java index 817248633bc..77049d538d1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/SinusoidalPattern.java @@ -63,7 +63,7 @@ public class SinusoidalPattern extends StructuredLightPattern { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java index 26fb7396c99..a08df378f17 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERStat.java @@ -52,7 +52,7 @@ public class ERStat extends Pointer { return (ERStat)super.position(position); } @Override public ERStat getPointer(long i) { - return new ERStat((Pointer)this).position(position + i); + return new ERStat((Pointer)this).offsetAddress(i); } /** Constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java index adb554de629..a32562238df 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRBeamSearchDecoder.java @@ -56,7 +56,7 @@ public class OCRBeamSearchDecoder extends BaseOCR { return (OCRBeamSearchDecoder)super.position(position); } @Override public OCRBeamSearchDecoder getPointer(long i) { - return new OCRBeamSearchDecoder((Pointer)this).position(position + i); + return new OCRBeamSearchDecoder((Pointer)this).offsetAddress(i); } @@ -83,7 +83,7 @@ public static class ClassifierCallback extends Pointer { return (ClassifierCallback)super.position(position); } @Override public ClassifierCallback getPointer(long i) { - return new ClassifierCallback((Pointer)this).position(position + i); + return new ClassifierCallback((Pointer)this).offsetAddress(i); } /** \brief The character classifier must return a (ranked list of) class(es) id('s) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java index f0769c761f7..2f58d9c657d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/OCRHMMDecoder.java @@ -53,7 +53,7 @@ public class OCRHMMDecoder extends BaseOCR { return (OCRHMMDecoder)super.position(position); } @Override public OCRHMMDecoder getPointer(long i) { - return new OCRHMMDecoder((Pointer)this).position(position + i); + return new OCRHMMDecoder((Pointer)this).offsetAddress(i); } @@ -80,7 +80,7 @@ public static class ClassifierCallback extends Pointer { return (ClassifierCallback)super.position(position); } @Override public ClassifierCallback getPointer(long i) { - return new ClassifierCallback((Pointer)this).position(position + i); + return new ClassifierCallback((Pointer)this).offsetAddress(i); } /** \brief The character classifier must return a (ranked list of) class(es) id('s) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java index 083b812ccf5..c0151d838f6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/AugmentedUnscentedKalmanFilterParams.java @@ -50,7 +50,7 @@ public class AugmentedUnscentedKalmanFilterParams extends UnscentedKalmanFilterP return (AugmentedUnscentedKalmanFilterParams)super.position(position); } @Override public AugmentedUnscentedKalmanFilterParams getPointer(long i) { - return new AugmentedUnscentedKalmanFilterParams((Pointer)this).position(position + i); + return new AugmentedUnscentedKalmanFilterParams((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java index 907758894a8..09424897345 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvFeatureParams.java @@ -47,7 +47,7 @@ public class CvFeatureParams extends CvParams { return (CvFeatureParams)super.position(position); } @Override public CvFeatureParams getPointer(long i) { - return new CvFeatureParams((Pointer)this).position(position + i); + return new CvFeatureParams((Pointer)this).offsetAddress(i); } /** enum cv::detail::tracking::contrib_feature::CvFeatureParams::FeatureType */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java index 0795cfe75d1..897f549bede 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGEvaluator.java @@ -50,7 +50,7 @@ public class CvHOGEvaluator extends CvFeatureEvaluator { return (CvHOGEvaluator)super.position(position); } @Override public CvHOGEvaluator getPointer(long i) { - return new CvHOGEvaluator((Pointer)this).position(position + i); + return new CvHOGEvaluator((Pointer)this).offsetAddress(i); } public native void init( @Const CvFeatureParams _featureParams, int _maxSampleCount, @ByVal Size _winSize ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java index f9179155f78..613fd8618d4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHOGFeatureParams.java @@ -47,7 +47,7 @@ public class CvHOGFeatureParams extends CvFeatureParams { return (CvHOGFeatureParams)super.position(position); } @Override public CvHOGFeatureParams getPointer(long i) { - return new CvHOGFeatureParams((Pointer)this).position(position + i); + return new CvHOGFeatureParams((Pointer)this).offsetAddress(i); } public CvHOGFeatureParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java index fb24be5b635..7dee4877835 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarEvaluator.java @@ -50,7 +50,7 @@ public class CvHaarEvaluator extends CvFeatureEvaluator { return (CvHaarEvaluator)super.position(position); } @Override public CvHaarEvaluator getPointer(long i) { - return new CvHaarEvaluator((Pointer)this).position(position + i); + return new CvHaarEvaluator((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java index 75c8daccf66..0069e3f3668 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvHaarFeatureParams.java @@ -47,7 +47,7 @@ public class CvHaarFeatureParams extends CvFeatureParams { return (CvHaarFeatureParams)super.position(position); } @Override public CvHaarFeatureParams getPointer(long i) { - return new CvHaarFeatureParams((Pointer)this).position(position + i); + return new CvHaarFeatureParams((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java index 72da265f469..5c5453bdce8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPEvaluator.java @@ -50,7 +50,7 @@ public class CvLBPEvaluator extends CvFeatureEvaluator { return (CvLBPEvaluator)super.position(position); } @Override public CvLBPEvaluator getPointer(long i) { - return new CvLBPEvaluator((Pointer)this).position(position + i); + return new CvLBPEvaluator((Pointer)this).offsetAddress(i); } public native void init( @Const CvFeatureParams _featureParams, int _maxSampleCount, @ByVal Size _winSize ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java index 2b77bdc047c..7f5eaaac054 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/CvLBPFeatureParams.java @@ -47,7 +47,7 @@ public class CvLBPFeatureParams extends CvFeatureParams { return (CvLBPFeatureParams)super.position(position); } @Override public CvLBPFeatureParams getPointer(long i) { - return new CvLBPFeatureParams((Pointer)this).position(position + i); + return new CvLBPFeatureParams((Pointer)this).offsetAddress(i); } public CvLBPFeatureParams() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java index 104928ebc64..8afa379403d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/EstimatedGaussDistribution.java @@ -47,7 +47,7 @@ public class EstimatedGaussDistribution extends Pointer { return (EstimatedGaussDistribution)super.position(position); } @Override public EstimatedGaussDistribution getPointer(long i) { - return new EstimatedGaussDistribution((Pointer)this).position(position + i); + return new EstimatedGaussDistribution((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java index a0fd039b4cb..424d649a7f2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/MatchTemplateDistance.java @@ -53,7 +53,7 @@ public class MatchTemplateDistance extends IDescriptorDistance { return (MatchTemplateDistance)super.position(position); } @Override public MatchTemplateDistance getPointer(long i) { - return new MatchTemplateDistance((Pointer)this).position(position + i); + return new MatchTemplateDistance((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java index e1689667e9a..47e7612ce8d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTPointVectorMap.java @@ -49,6 +49,7 @@ public class SizeTPointVectorMap extends Pointer { @Index public native @ByRef PointVector get(@Cast("size_t") long i); public native SizeTPointVectorMap put(@Cast("size_t") long i, PointVector value); + public native void erase(@ByVal Iterator pos); public native @ByVal Iterator begin(); public native @ByVal Iterator end(); @NoOffset @Name("iterator") public static class Iterator extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java index ccda8099e09..c8d6889f253 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/SizeTTrackMap.java @@ -49,6 +49,7 @@ public class SizeTTrackMap extends Pointer { @Index public native @ByRef Track get(@Cast("size_t") long i); public native SizeTTrackMap put(@Cast("size_t") long i, Track value); + public native void erase(@ByVal Iterator pos); public native @ByVal Iterator begin(); public native @ByVal Iterator end(); @NoOffset @Name("iterator") public static class Iterator extends Pointer { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java index 8ea36f5446b..e345084f7aa 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/Track.java @@ -50,7 +50,7 @@ public class Track extends Pointer { return (Track)super.position(position); } @Override public Track getPointer(long i) { - return new Track((Pointer)this).position(position + i); + return new Track((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java index 9655353dc6d..e81f2671ec7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackedObject.java @@ -49,7 +49,7 @@ public class TrackedObject extends Pointer { return (TrackedObject)super.position(position); } @Override public TrackedObject getPointer(long i) { - return new TrackedObject((Pointer)this).position(position + i); + return new TrackedObject((Pointer)this).offsetAddress(i); } /** Detected object ROI (zero area if N/A). */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java index b684b7bcf27..c0094ee7e1d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerCSRT.java @@ -72,7 +72,7 @@ public class TrackerCSRT extends Tracker { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java index 625d68b577f..939f7f831fe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerKCF.java @@ -74,7 +74,7 @@ public class TrackerKCF extends Tracker { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java index 5e81c0433cc..14bd7a54575 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/TrackerParams.java @@ -50,7 +50,7 @@ public class TrackerParams extends Pointer { return (TrackerParams)super.position(position); } @Override public TrackerParams getPointer(long i) { - return new TrackerParams((Pointer)this).position(position + i); + return new TrackerParams((Pointer)this).offsetAddress(i); } /** Min track duration in milliseconds. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java index 2a6241aff50..cb116d04636 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/UnscentedKalmanFilterParams.java @@ -51,7 +51,7 @@ public class UnscentedKalmanFilterParams extends Pointer { return (UnscentedKalmanFilterParams)super.position(position); } @Override public UnscentedKalmanFilterParams getPointer(long i) { - return new UnscentedKalmanFilterParams((Pointer)this).position(position + i); + return new UnscentedKalmanFilterParams((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java index 2e9a1ae1ba8..780fe6c0c9a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_tracking/WeakClassifierHaarFeature.java @@ -47,7 +47,7 @@ public class WeakClassifierHaarFeature extends Pointer { return (WeakClassifierHaarFeature)super.position(position); } @Override public WeakClassifierHaarFeature getPointer(long i) { - return new WeakClassifierHaarFeature((Pointer)this).position(position + i); + return new WeakClassifierHaarFeature((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java index f267dfc8dd3..8cc4fff68a4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/KalmanFilter.java @@ -54,7 +54,7 @@ public class KalmanFilter extends Pointer { return (KalmanFilter)super.position(position); } @Override public KalmanFilter getPointer(long i) { - return new KalmanFilter((Pointer)this).position(position + i); + return new KalmanFilter((Pointer)this).offsetAddress(i); } public KalmanFilter() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java index 283d56117cc..b04fcfe50cb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerGOTURN.java @@ -65,7 +65,7 @@ public class TrackerGOTURN extends Tracker { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java index 68d226c8a8d..f799cab46ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/TrackerMIL.java @@ -58,7 +58,7 @@ public class TrackerMIL extends Tracker { return (Params)super.position(position); } @Override public Params getPointer(long i) { - return new Params((Pointer)this).position(position + i); + return new Params((Pointer)this).offsetAddress(i); } public Params() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java index b01bac2a5e7..f3075a3fcb7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java @@ -34,6 +34,6 @@ public class CvCaptureDefaultDeleter extends Pointer { return (CvCaptureDefaultDeleter)super.position(position); } @Override public CvCaptureDefaultDeleter getPointer(long i) { - return new CvCaptureDefaultDeleter((Pointer)this).position(position + i); + return new CvCaptureDefaultDeleter((Pointer)this).offsetAddress(i); } public native @Name("operator ()") void apply(CvCapture obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java index 3eb03c9218e..ed93b6e4086 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java @@ -32,6 +32,6 @@ public class CvVideoWriterDefaultDeleter extends Pointer { return (CvVideoWriterDefaultDeleter)super.position(position); } @Override public CvVideoWriterDefaultDeleter getPointer(long i) { - return new CvVideoWriterDefaultDeleter((Pointer)this).position(position + i); + return new CvVideoWriterDefaultDeleter((Pointer)this).offsetAddress(i); } public native @Name("operator ()") void apply(CvVideoWriter obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java index 16d5bed6e7c..7a1bef0ad3a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/VideoWriter.java @@ -42,7 +42,7 @@ public class VideoWriter extends Pointer { return (VideoWriter)super.position(position); } @Override public VideoWriter getPointer(long i) { - return new VideoWriter((Pointer)this).position(position + i); + return new VideoWriter((Pointer)this).offsetAddress(i); } /** \brief Default constructors diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java index 64167f706d1..64ccc29bea8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorAverageInpainter.java @@ -55,7 +55,7 @@ public class ColorAverageInpainter extends InpainterBase { return (ColorAverageInpainter)super.position(position); } @Override public ColorAverageInpainter getPointer(long i) { - return new ColorAverageInpainter((Pointer)this).position(position + i); + return new ColorAverageInpainter((Pointer)this).offsetAddress(i); } public native void inpaint(int idx, @ByRef Mat frame, @ByRef Mat mask); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java index 174da0dfeaf..029bef9d211 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ColorInpainter.java @@ -52,7 +52,7 @@ public class ColorInpainter extends InpainterBase { return (ColorInpainter)super.position(position); } @Override public ColorInpainter getPointer(long i) { - return new ColorInpainter((Pointer)this).position(position + i); + return new ColorInpainter((Pointer)this).offsetAddress(i); } public ColorInpainter(int method/*=cv::INPAINT_TELEA*/, double radius/*=2.*/) { super((Pointer)null); allocate(method, radius); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java index 27c89be2cd9..78760012879 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/ConsistentMosaicInpainter.java @@ -52,7 +52,7 @@ public class ConsistentMosaicInpainter extends InpainterBase { return (ConsistentMosaicInpainter)super.position(position); } @Override public ConsistentMosaicInpainter getPointer(long i) { - return new ConsistentMosaicInpainter((Pointer)this).position(position + i); + return new ConsistentMosaicInpainter((Pointer)this).offsetAddress(i); } public ConsistentMosaicInpainter() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java index a16b8f4ce17..7f2b118e9c7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/FastMarchingMethod.java @@ -59,7 +59,7 @@ public class FastMarchingMethod extends Pointer { return (FastMarchingMethod)super.position(position); } @Override public FastMarchingMethod getPointer(long i) { - return new FastMarchingMethod((Pointer)this).position(position + i); + return new FastMarchingMethod((Pointer)this).offsetAddress(i); } public FastMarchingMethod() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java index e3e00f9a6af..1404eed396e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/GaussianMotionFilter.java @@ -52,7 +52,7 @@ public class GaussianMotionFilter extends MotionFilterBase { return (GaussianMotionFilter)super.position(position); } @Override public GaussianMotionFilter getPointer(long i) { - return new GaussianMotionFilter((Pointer)this).position(position + i); + return new GaussianMotionFilter((Pointer)this).offsetAddress(i); } public GaussianMotionFilter(int radius/*=15*/, float stdev/*=-1.f*/) { super((Pointer)null); allocate(radius, stdev); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java index 5f222edbf5c..51e7d9c3440 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/IFrameSource.java @@ -58,7 +58,7 @@ public class IFrameSource extends Pointer { return (IFrameSource)super.position(position); } @Override public IFrameSource getPointer(long i) { - return new IFrameSource((Pointer)this).position(position + i); + return new IFrameSource((Pointer)this).offsetAddress(i); } @Virtual(true) public native void reset(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java index 956e67904a3..ffc04066e9c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/InpaintingPipeline.java @@ -55,7 +55,7 @@ public class InpaintingPipeline extends InpainterBase { return (InpaintingPipeline)super.position(position); } @Override public InpaintingPipeline getPointer(long i) { - return new InpaintingPipeline((Pointer)this).position(position + i); + return new InpaintingPipeline((Pointer)this).offsetAddress(i); } public native void pushBack(@Ptr InpainterBase inpainter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java index 112b73bfc5d..d38acc2eb73 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/LogToStdout.java @@ -55,7 +55,7 @@ public class LogToStdout extends ILog { return (LogToStdout)super.position(position); } @Override public LogToStdout getPointer(long i) { - return new LogToStdout((Pointer)this).position(position + i); + return new LogToStdout((Pointer)this).offsetAddress(i); } public native void print(@Cast("const char*") BytePointer format); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java index 12ddf95f3ef..2a3d2d263bf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MoreAccurateMotionWobbleSuppressor.java @@ -55,7 +55,7 @@ public class MoreAccurateMotionWobbleSuppressor extends MoreAccurateMotionWobble return (MoreAccurateMotionWobbleSuppressor)super.position(position); } @Override public MoreAccurateMotionWobbleSuppressor getPointer(long i) { - return new MoreAccurateMotionWobbleSuppressor((Pointer)this).position(position + i); + return new MoreAccurateMotionWobbleSuppressor((Pointer)this).offsetAddress(i); } public native void suppress(int idx, @Const @ByRef Mat frame, @ByRef Mat result); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java index bbcf769fc4b..0e4de3fe80f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionInpainter.java @@ -52,7 +52,7 @@ public class MotionInpainter extends InpainterBase { return (MotionInpainter)super.position(position); } @Override public MotionInpainter getPointer(long i) { - return new MotionInpainter((Pointer)this).position(position + i); + return new MotionInpainter((Pointer)this).offsetAddress(i); } public MotionInpainter() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java index fa36b5d3bc8..7ede37d810a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/MotionStabilizationPipeline.java @@ -55,7 +55,7 @@ public class MotionStabilizationPipeline extends IMotionStabilizer { return (MotionStabilizationPipeline)super.position(position); } @Override public MotionStabilizationPipeline getPointer(long i) { - return new MotionStabilizationPipeline((Pointer)this).position(position + i); + return new MotionStabilizationPipeline((Pointer)this).offsetAddress(i); } public native void pushBack(@Ptr IMotionStabilizer stabilizer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java index 5fd507d3f06..11d36df3223 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullDeblurer.java @@ -55,7 +55,7 @@ public class NullDeblurer extends DeblurerBase { return (NullDeblurer)super.position(position); } @Override public NullDeblurer getPointer(long i) { - return new NullDeblurer((Pointer)this).position(position + i); + return new NullDeblurer((Pointer)this).offsetAddress(i); } public native void deblur(int arg0, @ByRef Mat arg1, @Const @ByRef Range arg2); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java index 3a215bb94d0..3914f60adc8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullFrameSource.java @@ -55,7 +55,7 @@ public class NullFrameSource extends IFrameSource { return (NullFrameSource)super.position(position); } @Override public NullFrameSource getPointer(long i) { - return new NullFrameSource((Pointer)this).position(position + i); + return new NullFrameSource((Pointer)this).offsetAddress(i); } public native void reset(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java index 43c71a352f6..c80397f61fd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullInpainter.java @@ -55,7 +55,7 @@ public class NullInpainter extends InpainterBase { return (NullInpainter)super.position(position); } @Override public NullInpainter getPointer(long i) { - return new NullInpainter((Pointer)this).position(position + i); + return new NullInpainter((Pointer)this).offsetAddress(i); } public native void inpaint(int arg0, @ByRef Mat arg1, @ByRef Mat arg2); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java index 92d6d6046d5..d2920fa711e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullLog.java @@ -55,7 +55,7 @@ public class NullLog extends ILog { return (NullLog)super.position(position); } @Override public NullLog getPointer(long i) { - return new NullLog((Pointer)this).position(position + i); + return new NullLog((Pointer)this).offsetAddress(i); } public native void print(@Cast("const char*") BytePointer arg0); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java index 36d9ea899d5..827d2a5687b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullOutlierRejector.java @@ -55,7 +55,7 @@ public class NullOutlierRejector extends IOutlierRejector { return (NullOutlierRejector)super.position(position); } @Override public NullOutlierRejector getPointer(long i) { - return new NullOutlierRejector((Pointer)this).position(position + i); + return new NullOutlierRejector((Pointer)this).offsetAddress(i); } public native void process( diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java index 403ba296481..4d17c586704 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/NullWobbleSuppressor.java @@ -55,7 +55,7 @@ public class NullWobbleSuppressor extends WobbleSuppressorBase { return (NullWobbleSuppressor)super.position(position); } @Override public NullWobbleSuppressor getPointer(long i) { - return new NullWobbleSuppressor((Pointer)this).position(position + i); + return new NullWobbleSuppressor((Pointer)this).offsetAddress(i); } public native void suppress(int idx, @Const @ByRef Mat frame, @ByRef Mat result); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java index c35a151a8d2..0ab9109b4a9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/OnePassStabilizer.java @@ -52,7 +52,7 @@ public class OnePassStabilizer extends StabilizerBase { return (OnePassStabilizer)super.position(position); } @Override public OnePassStabilizer getPointer(long i) { - return new OnePassStabilizer((Pointer)this).position(position + i); + return new OnePassStabilizer((Pointer)this).offsetAddress(i); } public IFrameSource asIFrameSource() { return asIFrameSource(this); } @Namespace public static native @Name("static_cast") IFrameSource asIFrameSource(OnePassStabilizer pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java index 1017326aeab..cc3424f2ae5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/PyrLkOptFlowEstimatorBase.java @@ -52,7 +52,7 @@ public class PyrLkOptFlowEstimatorBase extends Pointer { return (PyrLkOptFlowEstimatorBase)super.position(position); } @Override public PyrLkOptFlowEstimatorBase getPointer(long i) { - return new PyrLkOptFlowEstimatorBase((Pointer)this).position(position + i); + return new PyrLkOptFlowEstimatorBase((Pointer)this).offsetAddress(i); } public PyrLkOptFlowEstimatorBase() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java index 594dc389d87..bae02e17987 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/RansacParams.java @@ -54,7 +54,7 @@ public class RansacParams extends Pointer { return (RansacParams)super.position(position); } @Override public RansacParams getPointer(long i) { - return new RansacParams((Pointer)this).position(position + i); + return new RansacParams((Pointer)this).offsetAddress(i); } /** subset size */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java index ff954597d41..03c82e83fbc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/SparsePyrLkOptFlowEstimator.java @@ -55,7 +55,7 @@ public class SparsePyrLkOptFlowEstimator extends PyrLkOptFlowEstimatorBase { return (SparsePyrLkOptFlowEstimator)super.position(position); } @Override public SparsePyrLkOptFlowEstimator getPointer(long i) { - return new SparsePyrLkOptFlowEstimator((Pointer)this).position(position + i); + return new SparsePyrLkOptFlowEstimator((Pointer)this).offsetAddress(i); } public ISparseOptFlowEstimator asISparseOptFlowEstimator() { return asISparseOptFlowEstimator(this); } @Namespace public static native @Name("static_cast") ISparseOptFlowEstimator asISparseOptFlowEstimator(SparsePyrLkOptFlowEstimator pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java index d3d2bd29d88..37243d3af15 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TranslationBasedLocalOutlierRejector.java @@ -52,7 +52,7 @@ public class TranslationBasedLocalOutlierRejector extends IOutlierRejector { return (TranslationBasedLocalOutlierRejector)super.position(position); } @Override public TranslationBasedLocalOutlierRejector getPointer(long i) { - return new TranslationBasedLocalOutlierRejector((Pointer)this).position(position + i); + return new TranslationBasedLocalOutlierRejector((Pointer)this).offsetAddress(i); } public TranslationBasedLocalOutlierRejector() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java index d751329c53a..898136e6637 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/TwoPassStabilizer.java @@ -52,7 +52,7 @@ public class TwoPassStabilizer extends StabilizerBase { return (TwoPassStabilizer)super.position(position); } @Override public TwoPassStabilizer getPointer(long i) { - return new TwoPassStabilizer((Pointer)this).position(position + i); + return new TwoPassStabilizer((Pointer)this).offsetAddress(i); } public IFrameSource asIFrameSource() { return asIFrameSource(this); } @Namespace public static native @Name("static_cast") IFrameSource asIFrameSource(TwoPassStabilizer pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java index 573084a1973..fbe30968586 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videostab/WeightingDeblurer.java @@ -52,7 +52,7 @@ public class WeightingDeblurer extends DeblurerBase { return (WeightingDeblurer)super.position(position); } @Override public WeightingDeblurer getPointer(long i) { - return new WeightingDeblurer((Pointer)this).position(position + i); + return new WeightingDeblurer((Pointer)this).offsetAddress(i); } public WeightingDeblurer() { super((Pointer)null); allocate(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java index 2fe92913d02..c6649c52eb6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_wechat_qrcode/WeChatQRCode.java @@ -39,7 +39,7 @@ public class WeChatQRCode extends Pointer { return (WeChatQRCode)super.position(position); } @Override public WeChatQRCode getPointer(long i) { - return new WeChatQRCode((Pointer)this).position(position + i); + return new WeChatQRCode((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java index 406354ff0a8..e52a2e07d0c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java @@ -69,7 +69,7 @@ public class BEBLID extends Feature2D { return (BEBLID)super.position(position); } @Override public BEBLID getPointer(long i) { - return new BEBLID((Pointer)this).position(position + i); + return new BEBLID((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java index b1c05d2df00..cf6d965cc67 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java @@ -57,7 +57,7 @@ public class BriefDescriptorExtractor extends Feature2D { return (BriefDescriptorExtractor)super.position(position); } @Override public BriefDescriptorExtractor getPointer(long i) { - return new BriefDescriptorExtractor((Pointer)this).position(position + i); + return new BriefDescriptorExtractor((Pointer)this).offsetAddress(i); } public static native @Ptr BriefDescriptorExtractor create( int bytes/*=32*/, @Cast("bool") boolean use_orientation/*=false*/ ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java index 6160ebcdfed..15896482f81 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/Elliptic_KeyPoint.java @@ -47,7 +47,7 @@ public class Elliptic_KeyPoint extends KeyPoint { return (Elliptic_KeyPoint)super.position(position); } @Override public Elliptic_KeyPoint getPointer(long i) { - return new Elliptic_KeyPoint((Pointer)this).position(position + i); + return new Elliptic_KeyPoint((Pointer)this).offsetAddress(i); } /** the lengths of the major and minor ellipse axes */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java index 511698a97a5..968750f6a8f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java @@ -62,7 +62,7 @@ public class FREAK extends Feature2D { return (FREAK)super.position(position); } @Override public FREAK getPointer(long i) { - return new FREAK((Pointer)this).position(position + i); + return new FREAK((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java index 643f6114de1..6edb6f06c60 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java @@ -50,7 +50,7 @@ public class HarrisLaplaceFeatureDetector extends Feature2D { return (HarrisLaplaceFeatureDetector)super.position(position); } @Override public HarrisLaplaceFeatureDetector getPointer(long i) { - return new HarrisLaplaceFeatureDetector((Pointer)this).position(position + i); + return new HarrisLaplaceFeatureDetector((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java index ff7a34a422c..8abe9b47a43 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java @@ -70,7 +70,7 @@ public class LATCH extends Feature2D { return (LATCH)super.position(position); } @Override public LATCH getPointer(long i) { - return new LATCH((Pointer)this).position(position + i); + return new LATCH((Pointer)this).offsetAddress(i); } public static native @Ptr LATCH create(int bytes/*=32*/, @Cast("bool") boolean rotationInvariance/*=true*/, int half_ssd_size/*=3*/, double sigma/*=2.0*/); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java index f6caa17085c..9ead187aabc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java @@ -54,7 +54,7 @@ public class LUCID extends Feature2D { return (LUCID)super.position(position); } @Override public LUCID getPointer(long i) { - return new LUCID((Pointer)this).position(position + i); + return new LUCID((Pointer)this).offsetAddress(i); } /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java index 32b478bf248..98456a8c09a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java @@ -60,7 +60,7 @@ public class MSDDetector extends Feature2D { return (MSDDetector)super.position(position); } @Override public MSDDetector getPointer(long i) { - return new MSDDetector((Pointer)this).position(position + i); + return new MSDDetector((Pointer)this).offsetAddress(i); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java index c6f6e78594e..5745f62d24e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java @@ -50,7 +50,7 @@ public class StarDetector extends Feature2D { return (StarDetector)super.position(position); } @Override public StarDetector getPointer(long i) { - return new StarDetector((Pointer)this).position(position + i); + return new StarDetector((Pointer)this).offsetAddress(i); } /** the full constructor */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java index ee316d88182..7cf14f2adf7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/Box.java @@ -51,7 +51,7 @@ public class Box extends Pointer { return (Box)super.position(position); } @Override public Box getPointer(long i) { - return new Box((Pointer)this).position(position + i); + return new Box((Pointer)this).offsetAddress(i); } public native int x(); public native Box x(int setter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java index 41d28bc6e9c..e88aaa0b180 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java @@ -51,7 +51,7 @@ public class ContourFitting extends Algorithm { return (ContourFitting)super.position(position); } @Override public ContourFitting getPointer(long i) { - return new ContourFitting((Pointer)this).position(position + i); + return new ContourFitting((Pointer)this).offsetAddress(i); } /** \brief Fit two closed curves using fourier descriptors. More details in \cite PersoonFu1977 and \cite BergerRaghunathan1998 diff --git a/openpose/pom.xml b/openpose/pom.xml index fd1482e8dd8..8f80842d475 100644 --- a/openpose/pom.xml +++ b/openpose/pom.xml @@ -33,7 +33,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -71,7 +71,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco @@ -94,7 +94,7 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} diff --git a/platform/pom.xml b/platform/pom.xml index 135c706a198..e7daffdf303 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -169,12 +169,12 @@ org.bytedeco dnnl-platform - 2.2.1-${project.version} + 2.2.2-${project.version} org.bytedeco openblas-platform - 0.3.14-${project.version} + 0.3.15-${project.version} org.bytedeco @@ -199,17 +199,17 @@ org.bytedeco cpython-platform - 3.9.4-${project.version} + 3.9.5-${project.version} org.bytedeco numpy-platform - 1.20.2-${project.version} + 1.20.3-${project.version} org.bytedeco scipy-platform - 1.6.2-${project.version} + 1.6.3-${project.version} org.bytedeco @@ -249,7 +249,7 @@ org.bytedeco cuda-platform - 11.3-8.1-${project.version} + 11.3-8.2-${project.version} org.bytedeco diff --git a/pytorch/README.md b/pytorch/README.md index 5b9d9dcf02b..9d4203eafdd 100644 --- a/pytorch/README.md +++ b/pytorch/README.md @@ -60,7 +60,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh index e3043b6a1fa..c02c87ceaaf 100755 --- a/pytorch/cppbuild.sh +++ b/pytorch/cppbuild.sh @@ -27,7 +27,7 @@ fi cd pytorch git reset --hard git checkout v$PYTORCH_VERSION -git submodule update --init --recursive --jobs $MAKEJ +git submodule update --init --recursive git submodule foreach --recursive 'git reset --hard' CPYTHON_PATH="$INSTALL_PATH/../../../cpython/cppbuild/$PLATFORM/" diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml index 6ad8c365842..ee1eeb063b6 100644 --- a/pytorch/platform/gpu/pom.xml +++ b/pytorch/platform/gpu/pom.xml @@ -29,12 +29,12 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml index 4b9d6112ad3..ea029cbcc29 100644 --- a/pytorch/platform/pom.xml +++ b/pytorch/platform/pom.xml @@ -28,12 +28,12 @@ org.bytedeco openblas-platform - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 39abad95425..6bacc1b0a0b 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -22,12 +22,12 @@ org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true @@ -47,7 +47,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} diff --git a/pytorch/samples/pom.xml b/pytorch/samples/pom.xml index 7dc2fff5e40..c5c2723c2eb 100644 --- a/pytorch/samples/pom.xml +++ b/pytorch/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/scipy/README.md b/scipy/README.md index e253602faba..5b7cfb4d308 100644 --- a/scipy/README.md +++ b/scipy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * SciPy 1.6.2 https://www.scipy.org/ + * SciPy 1.6.3 https://www.scipy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco scipy-platform - 1.6.2-1.5.6-SNAPSHOT + 1.6.3-1.5.6-SNAPSHOT diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index c9dac4ad186..84f869491aa 100755 --- a/scipy/cppbuild.sh +++ b/scipy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -SCIPY_VERSION=1.6.2 +SCIPY_VERSION=1.6.3 download https://github.com/scipy/scipy/archive/v$SCIPY_VERSION.tar.gz scipy-$SCIPY_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index 9bcc3e3df88..67df004d956 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} JavaCPP Presets Platform for SciPy @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index 2e3d72b0212..773d9592fc3 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -11,14 +11,14 @@ org.bytedeco scipy - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} JavaCPP Presets for SciPy org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} org.bytedeco @@ -41,24 +41,24 @@ org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} org.bytedeco openblas - 0.3.14-${project.parent.version} + 0.3.15-${project.parent.version} ${javacpp.platform} org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${javacpp.platform} org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} ${javacpp.platform} @@ -177,7 +177,7 @@ org.bytedeco cpython - 3.9.4-${project.parent.version} + 3.9.5-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/samples/pom.xml b/scipy/samples/pom.xml index f52874ef7e8..ab03c9bc991 100644 --- a/scipy/samples/pom.xml +++ b/scipy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.6.2-1.5.6-SNAPSHOT + 1.6.3-1.5.6-SNAPSHOT diff --git a/tensorflow/README.md b/tensorflow/README.md index a9510693bd8..5072d850e86 100644 --- a/tensorflow/README.md +++ b/tensorflow/README.md @@ -63,7 +63,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/tensorflow/platform/gpu/pom.xml b/tensorflow/platform/gpu/pom.xml index d32b08aae15..a499eec8a8b 100644 --- a/tensorflow/platform/gpu/pom.xml +++ b/tensorflow/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true diff --git a/tensorflow/platform/pom.xml b/tensorflow/platform/pom.xml index 1c4c8829611..571a052a9aa 100644 --- a/tensorflow/platform/pom.xml +++ b/tensorflow/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true diff --git a/tensorflow/platform/python-gpu/pom.xml b/tensorflow/platform/python-gpu/pom.xml index dda491d78c1..2e48d386dc9 100644 --- a/tensorflow/platform/python-gpu/pom.xml +++ b/tensorflow/platform/python-gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} org.bytedeco diff --git a/tensorflow/platform/python/pom.xml b/tensorflow/platform/python/pom.xml index 4c45bf58df5..223f5062a42 100644 --- a/tensorflow/platform/python/pom.xml +++ b/tensorflow/platform/python/pom.xml @@ -24,7 +24,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} org.bytedeco diff --git a/tensorflow/pom.xml b/tensorflow/pom.xml index 4099a3afa20..222da22b92c 100644 --- a/tensorflow/pom.xml +++ b/tensorflow/pom.xml @@ -32,7 +32,7 @@ org.bytedeco numpy - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} true @@ -93,7 +93,7 @@ org.bytedeco numpy-platform - 1.20.2-${project.parent.version} + 1.20.3-${project.parent.version} diff --git a/tensorflow/samples/pom.xml b/tensorflow/samples/pom.xml index 442b24f25b3..f37edd5057d 100644 --- a/tensorflow/samples/pom.xml +++ b/tensorflow/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/tensorrt/README.md b/tensorrt/README.md index ff521b8b861..1b4eab60aeb 100644 --- a/tensorrt/README.md +++ b/tensorrt/README.md @@ -61,7 +61,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT org.bytedeco diff --git a/tensorrt/platform/pom.xml b/tensorrt/platform/pom.xml index 16bd0645411..7fb0378b970 100644 --- a/tensorrt/platform/pom.xml +++ b/tensorrt/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco cuda-platform - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} ${project.groupId} diff --git a/tensorrt/pom.xml b/tensorrt/pom.xml index 6598124d670..dbf8d8dbf68 100644 --- a/tensorrt/pom.xml +++ b/tensorrt/pom.xml @@ -18,7 +18,7 @@ org.bytedeco cuda - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} org.bytedeco @@ -44,7 +44,7 @@ org.bytedeco cuda - 11.3-8.1-${project.parent.version} + 11.3-8.2-${project.parent.version} diff --git a/tensorrt/samples/pom.xml b/tensorrt/samples/pom.xml index a8da2df11df..c1b2298e701 100644 --- a/tensorrt/samples/pom.xml +++ b/tensorrt/samples/pom.xml @@ -19,7 +19,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT org.bytedeco diff --git a/tvm/README.md b/tvm/README.md index de3a1169caa..fe0cb0ceec0 100644 --- a/tvm/README.md +++ b/tvm/README.md @@ -62,7 +62,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index c53458b10b2..a08009f7ba0 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} org.bytedeco @@ -39,7 +39,7 @@ org.bytedeco scipy-platform - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} ${project.groupId} diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index fea6f81aeda..6ea94e56428 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} org.bytedeco @@ -38,7 +38,7 @@ org.bytedeco scipy-platform - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} ${project.groupId} diff --git a/tvm/pom.xml b/tvm/pom.xml index 33061f19338..8e80c7d35e5 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -18,7 +18,7 @@ org.bytedeco dnnl - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} org.bytedeco @@ -33,7 +33,7 @@ org.bytedeco scipy - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} org.bytedeco @@ -56,7 +56,7 @@ org.bytedeco dnnl-platform - 2.2.1-${project.parent.version} + 2.2.2-${project.parent.version} org.bytedeco @@ -76,7 +76,7 @@ org.bytedeco scipy-platform - 1.6.2-${project.parent.version} + 1.6.3-${project.parent.version} diff --git a/tvm/samples/pom.xml b/tvm/samples/pom.xml index adf2dbea333..093129635a9 100644 --- a/tvm/samples/pom.xml +++ b/tvm/samples/pom.xml @@ -26,7 +26,7 @@ org.bytedeco cuda-platform-redist - 11.3-8.1-1.5.6-SNAPSHOT + 11.3-8.2-1.5.6-SNAPSHOT