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

Jump to bottom

ximea interface update #6032

Merged
merged 1 commit into from
Feb 9, 2016
Merged

ximea interface update #6032

merged 1 commit into from
Feb 9, 2016

Conversation

mzajko
Copy link
Contributor

@mzajko mzajko commented Jan 29, 2016

  • fixed getProperty call definition
  • added new parameter defitions

@alalek
Copy link
Member

alalek commented Feb 2, 2016

Changing enum values is not allowed in public headers for ABI compatibility (for example, CV_CAP_PROP_XI_IMAGE_DATA_FORMAT).

@mzajko
Copy link
Contributor Author

mzajko commented Feb 2, 2016

Hi All, can someone please explain what happened in the Win10 x64 VS2015 test build
as it failed: http://pullrequest.opencv.org/buildbot/builders/precommit_windows_ten/builds/627/steps/init/logs/stdio
Thanks a lot.

@alalek
Copy link
Member

alalek commented Feb 2, 2016

@mzajko It is not related to your patch. Ignore this error.

@mzajko
Copy link
Contributor Author

mzajko commented Feb 3, 2016

@alalek Please let me know whether the last update resolved the issue with enums and merge the changes if possible. Thank you.

alalek
alalek reviewed Feb 3, 2016
View reviewed changes
modules/videoio/include/opencv2/videoio/videoio_c.h
CV_CAP_PROP_XI_CMS = 470, // Mode of color management system.
CV_CAP_PROP_XI_APPLY_CMS = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE).
CV_CAP_PROP_XI_IMAGE_IS_COLOR = 474, // Returns 1 for color cameras.
CV_CAP_PROP_XI_IMAGE_IS_COLOR = 473, // Returns 1 for color cameras.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enum value is changed here (ABI violation issue). Is it a bug fix?

List of changed/removed enum values:
http://pullrequest.opencv.org/buildbot/builders/precommit_linux64/builds/5314/steps/Compare%20ABI%20dumps/logs/report-html#Constant_Source_Problems_Low

@alalek
Copy link
Member

alalek commented Feb 4, 2016

Thanks! Looks good to me.

Please squash all commits into one to remove unnecessary intermediate changes from git history (there is also fix for "const" method, so also update to the latest master branch):

git fetch upstream
git rebase -i upstream/master
# 1st commit - pick, other - "s" or "f"; save
git push -f origin ximea_getprop_update

@mzajko
Copy link
Contributor Author

mzajko commented Feb 8, 2016

@alalek Hi, I squashed all commits as you suggested. Please let me know if there is anything else to
be done. If not please merge the changes. Thanks for the help!

@alalek
Copy link
Member

alalek commented Feb 8, 2016

Actually these commits are not squashed. There are 6 commits at this moment, but only 1 commit is expected.

@mzajko
Copy link
Contributor Author

mzajko commented Feb 8, 2016

@alalek Sorry, I was using Tortoisegit to combine commits but it seems I got it a bit wrong...
Unfortunately I have not used the feature to squash commits, could you please advise in more
detail how to do this operation on the ximea_getprop_update branch? Thank you.

@alalek
Copy link
Member

alalek commented Feb 8, 2016

Unfortunately, I have no guide for Tortoisegit.

  1. Open git shell (Git Bash) in your OpenCV source directory
  2. Fetch OpenCV master code
git remote add upstream git://github.com/Itseez/opencv
git fetch upstream master
  1. git checkout ximea_getprop_update
  2. Run git rebase: git rebase -i upstream/master
    or EDITOR=notepad.exe git rebase -i upstream/master
  3. Edit commit list: leave "pick" for first commit, replace "pick" to "s"/"f" for other commits. Save document, close editor
  4. git push -f origin ximea_getprop_update

@mzajko
ximea interface update
c216573 
- fixed getProperty call definition
- added new parameter defitions

removed whitespaces

Reworked enumerators to keep values from previous commit

ximea enums fixes

- fixed whitespaces issue
- fixed duplicate enum values error

ximea enum definitions update

- fixed videioio.hpp code style
- fixed ABI violation in enums
- added new parameter handlers to cpp

XIMEA setProperty update

Added acquisition resetting to buffer size adjustment parameters.
@mzajko
Copy link
Contributor Author

mzajko commented Feb 9, 2016

@alalek Thank you very much, all tests have passed successfully on the squashed commit.

@alalek
Copy link
Member

alalek commented Feb 9, 2016

Well done! 👍

@opencv-pushbot opencv-pushbot merged commit c216573 into opencv:master Feb 9, 2016
opencv-pushbot pushed a commit that referenced this pull request Feb 9, 2016
@alalek
Merge pull request #6032 from mzajko:ximea_getprop_update
b529b37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alalek alalek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mzajko @alalek @opencv-pushbot