Ps3eye fixes in Windows and OSX. #162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Mar 11, 2015
Closed
|
Oh, by the way - you can force-push changes over an existing branch, thereby updating a pull request and replacing the commits, no need to always open and close pull requests, as it makes it hard for me to follow along where we are at the moment (I think I just commented in a commit in a closed pull request). |
|
Sorry about that. I'll look into force-push. Do you want me to work on the closed PR or is it OK to keep this one for this time? |
|
Yes, let's keep this one for this time. No problem, just a suggestion for the future :) |
Setting red and blue balance values does not work well with PS3EYEDriver. Comment out for now.
|
|
||
| char *intrinsics_xml = psmove_util_get_file_path(INTRINSICS_XML); | ||
| char *distortion_xml = psmove_util_get_file_path(DISTORTION_XML); | ||
| camera_control_read_calibration(tracker->cc, intrinsics_xml, distortion_xml); | ||
| camera_control_read_calibration(tracker->cc, intrinsics_xml, distortion_xml); // Crashes if cc is NULL |
There was a problem hiding this comment.
This shouldn't happen anymore, now that you return NULL above for when tracker->cc is NULL.
|
This should be ready now. |
|
Looks good now, thanks a lot :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces PR #152
-tracker fails gracefully when PS3EYE specified at compile time but not plugged in.
-exposure and gain parameters passed through to PS3EYE when using PS3EYEDriver. This greatly improves the performance of the tracker in well-lit environments.