Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pytorch, OpenCV] Implicit ArrayRef, Updates for JavaCPP 1.5.10 #1455

Merged
merged 14 commits into from
Jan 14, 2024
Merged

[Pytorch, OpenCV] Implicit ArrayRef, Updates for JavaCPP 1.5.10 #1455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cf2136f
Have methods taking ArrayRef accept Vector
HGuillemet Dec 27, 2023
ea8faba
Use full declaration name for constructor templates
HGuillemet Dec 30, 2023
7ac6e24
Update gen
HGuillemet Jan 2, 2024
d5b3c8c
Fix fetch_and_cast and cast_and_store for complexes
HGuillemet Jan 3, 2024
8044733
Remove c10::detail::_str
HGuillemet Jan 3, 2024
822d08b
Correctly map `ListElementReference::swap`
HGuillemet Jan 3, 2024
291033f
Simplify AnyModule constructors info
HGuillemet Jan 5, 2024
77e27ac
Adaptations to bytedeco/javacpp#733
HGuillemet Jan 9, 2024
7591bbf
Add update on Algorithm, add cv::read and cv::write instantiations
HGuillemet Jan 9, 2024
6d8a6fe
Removed useless class
HGuillemet Jan 10, 2024
0a22e23
Removed useless classes
HGuillemet Jan 10, 2024
761a775
Removed useless class
HGuillemet Jan 10, 2024
75db09b
Removed useless classes
HGuillemet Jan 10, 2024
a3a8957
Fix formatting
saudet Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions depthai/src/gen/java/org/bytedeco/depthai/ConnectionHash.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ public void map(InfoMap infoMap) {
"std::unordered_map<std::string,std::shared_ptr<dai::ADatatype> >::iterator",
"std::unordered_map<std::tuple<std::string,std::string>,dai::NodeIoInfo,dai::NodeObjInfo::IoInfoKey>",
"dai::copyable_unique_ptr<dai::Properties>", "nop::Status<void>").cast().pointerTypes("Pointer"))
.put(new Info("std::hash<dai::Node::Connection>").pointerTypes("ConnectionHash"))
.put(new Info("std::shared_ptr<dai::Asset>").annotations("@SharedPtr").pointerTypes("Asset"))
.put(new Info("std::shared_ptr<dai::ADatatype>").annotations("@SharedPtr").pointerTypes("ADatatype"))
.put(new Info("std::shared_ptr<dai::Node>").annotations("@SharedPtr").pointerTypes("Node"))
Expand Down
126 changes: 120 additions & 6 deletions opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6849,10 +6849,11 @@ CV_CALL macro calls CV (or IPL) function, checks error status and
@Namespace("cv") public static native void insertImageCOI(@ByVal UMat coiimg, CvArr arr);
@Namespace("cv") public static native void insertImageCOI(@ByVal GpuMat coiimg, CvArr arr, int coi/*=-1*/);
@Namespace("cv") public static native void insertImageCOI(@ByVal GpuMat coiimg, CvArr arr);
// Targeting ../opencv_core/CvMatDefaultDeleter.java



////// specialized implementations of DefaultDeleter::operator() for classic OpenCV types //////

////////////// convenient wrappers for operating old-style dynamic structures //////////////

/**
Expand Down Expand Up @@ -12192,6 +12193,18 @@ storage is built in memory as a hierarchy of file nodes (see FileNode)
@Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef KeyPoint value, @Const @ByRef KeyPoint default_value);
@Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef DMatch value, @Const @ByRef DMatch default_value);

@Namespace("cv") public static native @Name("read<int>") void read(@Const @ByRef FileNode node, @ByRef Point value, @Const @ByRef Point default_value);

@Namespace("cv") public static native @Name("read<int>") void read(@Const @ByRef FileNode node, @ByRef Point3i value, @Const @ByRef Point3i default_value);

@Namespace("cv") public static native @Name("read<int>") void read(@Const @ByRef FileNode node, @ByRef Size value, @Const @ByRef Size default_value);



@Namespace("cv") public static native @Name("read<int>") void read(@Const @ByRef FileNode node, @ByRef Rect value, @Const @ByRef Rect default_value);

@Namespace("cv") public static native @Name("read<int>") void read(@Const @ByRef FileNode node, @ByRef Scalar4i value, @Const @ByRef Scalar4i default_value);

@Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef Range value, @Const @ByRef Range default_value);

/** \}
Expand All @@ -12212,14 +12225,48 @@ storage is built in memory as a hierarchy of file nodes (see FileNode)
* \relates cv::FileStorage
* \{ */

@Namespace("cv") public static native void write( @ByRef FileStorage fs, int value );
@Namespace("cv") public static native void write(@ByRef FileStorage fs, int value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, float value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, double value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str BytePointer value);
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str String value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point2f value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point2d value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3i value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3f value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3d value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size2f value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size2d value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Complexf value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Complexd value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect value);

@Namespace("cv") public static native void write( @ByRef FileStorage fs, float value );
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect2f value);

@Namespace("cv") public static native void write( @ByRef FileStorage fs, double value );
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect2d value);

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer value );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String value );
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar4i value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar4f value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar value);

@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Range r );

Expand All @@ -12232,6 +12279,57 @@ storage is built in memory as a hierarchy of file nodes (see FileNode)
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef DMatch m);
@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str String name, @Const @ByRef DMatch m);

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point2f val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point2f val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point2d val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point2d val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3i val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3i val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3f val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3f val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3d val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3d val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size2f val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size2f val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size2d val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size2d val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Complexf val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Complexf val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Complexd val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Complexd val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect2f val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect2f val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect2d val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect2d val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar4i val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar4i val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar4f val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar4f val );

@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar val );
@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar val );

// #ifdef CV__LEGACY_PERSISTENCE
// This code is not needed anymore, but it is preserved here to keep source compatibility
// Implementation is similar to templates instantiations
Expand All @@ -12257,6 +12355,22 @@ storage is built in memory as a hierarchy of file nodes (see FileNode)
@Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("ushort*") @ByRef ShortBuffer value, @Cast("ushort") short default_value);
@Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("ushort*") @ByRef short[] value, @Cast("ushort") short default_value);

@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector IntPointer vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector IntPointer vec );
@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector IntBuffer vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector IntBuffer vec );
@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector int[] vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @ByRef FileNodeIterator it, @StdVector int[] vec );



@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector IntPointer vec, @StdVector IntPointer default_value/*=std::vector<int>()*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector IntPointer vec );
@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector IntBuffer vec, @StdVector IntBuffer default_value/*=std::vector<int>()*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector IntBuffer vec );
@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector int[] vec, @StdVector int[] default_value/*=std::vector<int>()*/ );
@Namespace("cv") public static native @Name("read<int>") void read( @Const @ByRef FileNode node, @StdVector int[] vec );

@Namespace("cv") public static native void read( @Const @ByRef FileNode node, @ByRef KeyPointVector vec, @Const @ByRef KeyPointVector default_value );

@Namespace("cv") public static native void read( @Const @ByRef FileNode node, @ByRef DMatchVector vec, @Const @ByRef DMatchVector default_value );
Expand Down
22 changes: 16 additions & 6 deletions opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod
\{
\defgroup cudacodec Video Encoding/Decoding
\}
*/ // Stream
*/

/** \addtogroup cudacodec
* \{
Expand Down Expand Up @@ -229,9 +229,9 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod

/** \brief Creates video writer.
<p>
@param fileName Name of the output video file. Only raw h264 or hevc files are supported.
@param fileName Name of the output video file.
@param frameSize Size of the input video frames.
@param codec Codec.
@param codec Supports Codec::H264 and Codec::HEVC.
@param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded.
@param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback. Required for working with the encoded video stream.
Expand All @@ -246,9 +246,9 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod

/** \brief Creates video writer.
<p>
@param fileName Name of the output video file. Only raw h264 or hevc files are supported.
@param fileName Name of the output video file.
@param frameSize Size of the input video frames.
@param codec Codec.
@param codec Supports Codec::H264 and Codec::HEVC.
@param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded.
@param params Additional encoding parameters.
Expand Down Expand Up @@ -278,14 +278,24 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod

/** \brief Deinterlacing mode used by decoder.
* @param Weave Weave both fields (no deinterlacing). For progressive content and for content that doesn't need deinterlacing.
* Bob Drop one field.
* @param Bob Drop one field.
* @param Adaptive Adaptive deinterlacing needs more video memory than other deinterlacing modes.
* */
/** enum cv::cudacodec::DeinterlaceMode */
public static final int
Weave = 0,
Bob = 1,
Adaptive = 2;

/** \brief Utility function demonstrating how to map the luma histogram when FormatInfo::videoFullRangeFlag == false
@param hist Luma histogram \a hist returned from VideoReader::nextFrame(GpuMat& frame, GpuMat& hist, Stream& stream).
@param histFull Host histogram equivelent to downloading \a hist after calling cuda::calcHist(InputArray frame, OutputArray hist, Stream& stream).
<p>
\note
- This function demonstrates how to map the luma histogram back so that it is equivalent to the result obtained from cuda::calcHist()
if the returned frame was colorFormat::GRAY.
*/
@Namespace("cv::cudacodec") public static native void MapHist(@Const @ByRef GpuMat hist, @ByRef Mat histFull);
// Targeting ../opencv_cudacodec/FormatInfo.java


Expand Down
Loading