Skip to content

unmerged changes from 2.4 branch#625

Closed
vinograd47 wants to merge 1 commit intoopencv:masterfrom
vinograd47:gpu-fixes
Closed

unmerged changes from 2.4 branch#625
vinograd47 wants to merge 1 commit intoopencv:masterfrom
vinograd47:gpu-fixes

Conversation

@vinograd47
Copy link
Copy Markdown
Contributor

This changes weren't merged from 2.4 branch into master.

@taka-no-me
Copy link
Copy Markdown

2.5 will not be compatible with 2.4 any way. So I see no point for introducing ogl namespace in master.

@taka-no-me
Copy link
Copy Markdown

Also using namespace std; is prohibited in master as we already started a work on STL dependency removal. So please always explicitly qualify all std members with std:: prefix.

@ghost ghost assigned taka-no-me Mar 6, 2013
@vinograd47
Copy link
Copy Markdown
Contributor Author

This PR also fixes this bugs:
http://code.opencv.org/issues/2737
http://code.opencv.org/issues/2848

@Nerei
Copy link
Copy Markdown
Contributor

Nerei commented Mar 11, 2013

👍

As far as I understand stl is being removed only from interface. So the requirement about using namespace std is extra. @taka-no-me Why do want this?

@taka-no-me
Copy link
Copy Markdown

  1. Bugfixes must be visible and separable from other work.
  2. If you want to introduce ogl namespace in master then a) this design has to be discussed b) legacy version has to be removed.
  3. Anatoly, you were invited to the discussion of stl removal. Now it is not a time for putting your disagreement on the decisions made.

@Nerei
Copy link
Copy Markdown
Contributor

Nerei commented Mar 11, 2013

@taka-no-me I'd like to say that soviet person doesn't answer questions directly :(

@vinograd47
Copy link
Copy Markdown
Contributor Author

  1. This issues aren't a bugs, it is compilation errors. I can fix it separately, but this PR rewrites affected files, so this fixes became unnecessary after this PR.
  2. Legacy version was removed. Only new ogl:: version is available.

@vinograd47
Copy link
Copy Markdown
Contributor Author

@taka-no-me Do you have any other remarks?

@geexie
Copy link
Copy Markdown
Contributor

geexie commented Mar 12, 2013

@Jet47, @taka-no-me: Namespace ogl is usually used for high level opengl wrappers I think to use such common name is not a good idea. Except ogl related changes I agree with this request.

@Nerei
Copy link
Copy Markdown
Contributor

Nerei commented Mar 12, 2013

do you mean conflict with other ogl namespaces? how about cv::ogl?

@Nerei
Copy link
Copy Markdown
Contributor

Nerei commented Mar 12, 2013

@cuda-geek

@geexie
Copy link
Copy Markdown
Contributor

geexie commented Mar 12, 2013

@Nerei, ogl is already in cv and from this point of view this is ok until somebody will write using namespace cv;.

@vinograd47
Copy link
Copy Markdown
Contributor Author

@cuda-geek, ogl namespace is already used in 2.4 branch.

@taka-no-me
Copy link
Copy Markdown

Please never use "already used" as an argument for not making the code better. And lets discuss the usage of namespaces in 2.5 on today's meeting. This question is wider then current debates on ogl namespace.

@taka-no-me
Copy link
Copy Markdown

Updated commit message to reflect actual change and fixed issues and merged as ecb2ebf

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants