-
Notifications
You must be signed in to change notification settings - Fork 751
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.
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
Add support for FlyCapture 2 C and C++ API. #6
Conversation
Before we go further with FlyCapture, I've just remembered that the copyright in the header files did not allow me to publish the processed results, under the GPL + exception for example. I got permission from PGR just to make sure, and it was fine back then, but I think we'll need to do the same for the new set of header files as well... |
Could you update your branch with the changes for the C++ API as well so I can check out that problem with the |
C++ API is on separate branch: It was my mistake originally not to put flycapture and flandmark on a separate branches. This way I could have done a PR request for flandmark separately from flycapture. I was waiting for you to accept first PR for flycapture C API, then I would do a separate PR for flandmark (with separate branches I would not have to wait). |
I see, I'll go take a look there then! If we don't encounter too many problems though, I'd like to accept the C and C++ API together. What do you think? I'll be checking the C++ API out soon. BTW, we can still modify this branch to contain whatever you want... You'll need to squash things to get only one commit in there eventually though. |
Do whatever is more convenient for you. My intention to keep things separate, especially between flycapture and flandmark, was to help you merge changes into the main repo, At the moment I do not have much more thing related to flycapture. I was planing to concentrate on C++ API. Once the issue with There are some "hacks" in |
You could create another PR for flandmark, and if you're satisfied with its state, I'll merge it! I fixed the issues that were causing problems with the Java doesn't support something like
(BTW, according to Java Code Conventions, when breaking lines, commas are left at the end of lines, but other operators including dots are placed at the beginning.) |
… `cppbuild` subdirectories, instead of on the system
Changes to javacpp fixed issue with
I am not clear how to proceed. Can you take a look? The code is on my fork on branch |
Indeed, there's a
Thanks! |
That change to |
Ok, it looks good. There's a few small things we could fix:
But those are things I can fix myself when I adjust it and test it for Linux anyway. So, squash all those changes into one commit in the branch of this PR and I'll be happy to merge it 👍 Thanks! |
I will prepare updated PR with the latest version. BTW: I added a simple examples of using FlyCapture 2 wrapper to javacv-examples on |
This PR is superseded by PR #10. |
Reopened with rebased and squashed changes, as requested. Note: flandmark commits are excluded, so this is only FlyCapture 2 stuff, including its C++ API. |
Strange, some of my old commits are showing up in your PR. Is this normal? |
I do not know if that is normal. Note that those two commits were made after the initial PR. I did rebasing on my
Those two commits showed up there. I squished all my commits, but left the two unchanged. The two commits were initially merged into my Nothing unusual there, it just looks strange in GitHub. |
Add support for FlyCapture 2 C and C++ API.
Lightly tested with Java 7 and Windows x64 - there are no know issues at present. SDK initialization, camera initialization and querying cameras properties works. .
There are some hacks in
presets/FlyCapture2_C.java
to deal withfc2Property
andfc2PropertyInfo
not being generated by the Parser (fromtypedef struct
), see line 525 and 545 inC:\Program Files\Point Grey Research\FlyCapture2\include\C\FlyCapture2Defs_C.h
.Theoretically the wrappers can be also created for Linux.