Add surface_matching module. #70

bmagyar · 2014-08-19T13:39:44Z

This is the surface_matching module developed by @tolgabirdal for the GSoC 2014.

Video can be found here

Apart from not displaying the table, it breaks the doc build of opencv/opencv_contrib#70.

bmagyar · 2014-08-19T16:00:52Z

The doc build will be fixed when opencv/opencv#3133 is merged.

bmagyar · 2014-08-20T09:18:03Z

@vpisarev , could you please take a look at this?
http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/270/steps/compile%20release/logs/stdio
I went to the opencv repo but couldn't find where this is coming from exactly.

Second fix in docs needed for opencv/opencv_contrib#70 http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/277

bmagyar · 2014-08-25T16:33:51Z

@vpisarev All green. Can you please review the code? I can squash the commits before you merge the PR. We are working on some further improvemens but this could still go through now as it adds basic functionalities and docs.

vpisarev · 2014-08-29T08:28:52Z

modules/surface_matching/include/opencv2/icp.hpp

@@ -0,0 +1,163 @@
+//


please, move icp.hpp and other headers to include/opencv2/surface_matching subdirectory

bmagyar · 2014-08-29T08:34:22Z

@vpisarev please don't review it yet, I have to make some order in the branch of the PR, the last merge/rebase this morning made an awful mess. This is not the final version at all.

I will ping you again when it's ready and neat. Sorry for the inconvenience.

vpisarev · 2014-08-29T08:34:39Z

modules/surface_matching/include/opencv2/surface_matching/ppf_helpers.hpp

+ *  and whether it should be loaded or not
+ *  \return Returns the matrix on successfull load
+ */
+CV_EXPORTS cv::Mat loadPLYSimple(const char* fileName, int withNormals);


no need to use cv:: when you are already inside cv namespace. Extra non-alphabetic characters make the code less readable.

bmagyar · 2014-08-29T09:47:42Z

Squashed commits, from now on only fixes for your comments will come. @vpisarev please proceed.

vpisarev · 2014-09-01T19:04:37Z

modules/surface_matching/include/opencv2/surface_matching/pose_3d.hpp

+//
+// Author: Tolga Birdal <tbirdal AT gmail.com>
+
+#ifndef _OPENCV_POSE3D_HPP_


should we use some common prefix for the guard macros like
_ _ OPENCV_SURFMATCH_POSE3D_HPP _ _
?

vpisarev · 2014-09-01T19:08:53Z

I still see that 2 headers, icp.hpp and ppf_match_3d.hpp are not inside surfacematch subdirectory. Otherwise, the PR seems to be pretty much ready for integration

bmagyar · 2014-09-02T11:21:37Z

I will work a bit more on removing not needed members and arguments of the API classes and make sure that Ptr changes are harmless.

vpisarev · 2014-09-02T16:01:28Z

ok, to me it looks pretty much ready for integration; @bmagyar, if you are done with the changes, I will merge it in.

bmagyar · 2014-09-02T16:22:34Z

The code works as it is now. If the last doc build passes, you can merge it if you want.

I will open a new PR with further refinements. I almost got rid of all the pointers but I'm too pedantic to leave them there, I also have some more ideas for other parts...

vpisarev · 2014-09-02T17:04:58Z

looks like doc builder failed; could you correct it?

bmagyar · 2014-09-02T17:46:02Z

Docs should be good now.

On 2 September 2014 19:04, Vadim Pisarevsky notifications@github.com
wrote:

looks like doc builder failed; could you correct it?

—
Reply to this email directly or view it on GitHub
#70 (comment).

Bence Magyar

Robotics Engineer

bence.magyar@pal-robotics.com

www.pal-robotics.com

Pal Robotics, S.L.
c/ Pujades 77-79, 4º4ª
08005 Barcelona
Spain
Tel +34 93 414 53 47
Fax +34 93 209 11 09
Skype: bencemagyar.pal-robotics

Facebook http://www.facebook.com/palrobotics1 - Twitter
http://twitter.com/#%21/palrobotics - PAL Robotics YouTube Channel
http://www.youtube.com/user/PALRobotics

P Antes de imprimir este e-mail piense bien si es necesario hacerlo: El
medioambiente es cosa de todos.

AVISO DE CONFIDENCIALIDAD: Este mensaje y sus documentos adjuntos, pueden
contener información privilegiada y/o confidencial que está dirigida
exclusivamente a su destinatario. Si usted recibe este mensaje y no es el
destinatario indicado, o el empleado encargado de su entrega a dicha
persona, por favor, notifíquelo inmediatamente y remita el mensaje original
a la dirección de correo electrónico indicada. Cualquier copia, uso o
distribución no autorizados de esta comunicación queda estrictamente
prohibida.
CONFIDENTIALITY NOTICE: This e-mail and the accompanying document(s) may
contain confidential information which is privileged and intended only for
the individual or entity to whom they are addressed. If you are not the
intended recipient, you are hereby notified that any disclosure, copying,
distribution or use of this e-mail and/or accompanying document(s) is
strictly prohibited. If you have received this e-mail in error, please
immediately notify the sender at the above e-mail address.

bmagyar · 2014-09-03T08:51:29Z

All greeen, sample runs fine here.
I will add tests in the next PR.

vpisarev · 2014-09-04T17:15:10Z

👍

Add surface_matching module.

bmagyar · 2014-09-04T21:03:31Z

thanks! 👍

tolgabirdal · 2016-02-04T09:12:34Z

Please define the keytype as follows:

#if (defined x86_64 || defined _M_X64)
#include
typedef uint64_t KeyType;
#else
typedef unsigned int KeyType;
#endif

This will be fixed.

All the bests,

On 04 Feb 2016, at 08:57, patrycjabb notifications@github.com wrote:

Hi! I was trying to run surface_matching module, but I get an error when running with sample data:

"Run-Time Check Failure #2 - Stack around the variable 'hashKey' was corrupted."

It's at the beginning - training step.
Can anyone help?

—
Reply to this email directly or view it on GitHub.

patrycjabb · 2016-02-04T10:12:15Z

Thank you!

I fixed it by replacing "murmurHash" with "hashMurmurx86", as written here #170

JoyMazumder · 2018-10-19T17:00:48Z

Hello, I am new at C++. Can you tell me in which file I should add those lines? Thank you

bmagyar added a commit to bmagyar/opencv that referenced this pull request Aug 19, 2014

Fix color table

04b2d9a

Apart from not displaying the table, it breaks the doc build of opencv/opencv_contrib#70.

bmagyar mentioned this pull request Aug 19, 2014

Fix color table opencv/opencv#3133

Merged

bmagyar added a commit to bmagyar/opencv that referenced this pull request Aug 20, 2014

Update tocDefinitions.rst

1118a7d

Second fix in docs needed for opencv/opencv_contrib#70 http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/277

bmagyar mentioned this pull request Aug 20, 2014

Update tocDefinitions.rst opencv/opencv#3139

Merged

vpisarev reviewed Aug 29, 2014
View reviewed changes

vpisarev reviewed Sep 1, 2014
View reviewed changes

vpisarev self-assigned this Sep 2, 2014

bmagyar added 6 commits September 3, 2014 10:13

Add surface_matching module.

607f2bf

__inline -> inline

9d6fc04

cv::Mat -> Mat

a392d11

Unify include guards

9401285

Move header files inside opencv2/surface_matching/, update the rest

d1193e3

Cosmetic changes

995b696

bmagyar and others added 4 commits September 3, 2014 10:14

Refactored API classes, removed unused params

3f620fd

UNFINISHED: get rid of pointers

a8a4524

Update docu sample source

ef9b8a9

hash license added

8031741

vpisarev added a commit that referenced this pull request Sep 4, 2014

Merge pull request #70 from tolgabirdal/add_surface_matching_gsoc

b41783a

Add surface_matching module.

vpisarev merged commit b41783a into opencv:master Sep 4, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add surface_matching module. #70

Add surface_matching module. #70

bmagyar commented Aug 19, 2014

bmagyar commented Aug 19, 2014

bmagyar commented Aug 20, 2014

bmagyar commented Aug 25, 2014

vpisarev Aug 29, 2014

bmagyar Sep 2, 2014

bmagyar commented Aug 29, 2014

vpisarev Aug 29, 2014

bmagyar Sep 2, 2014

bmagyar commented Aug 29, 2014

vpisarev Sep 1, 2014

bmagyar Sep 2, 2014

vpisarev commented Sep 1, 2014

bmagyar commented Sep 2, 2014

vpisarev commented Sep 2, 2014

bmagyar commented Sep 2, 2014

vpisarev commented Sep 2, 2014

bmagyar commented Sep 2, 2014

bmagyar commented Sep 3, 2014

vpisarev commented Sep 4, 2014

bmagyar commented Sep 4, 2014

tolgabirdal commented Feb 4, 2016

patrycjabb commented Feb 4, 2016

JoyMazumder commented Oct 19, 2018

Add surface_matching module. #70

Add surface_matching module. #70

Conversation

bmagyar commented Aug 19, 2014

bmagyar commented Aug 19, 2014

bmagyar commented Aug 20, 2014

bmagyar commented Aug 25, 2014

vpisarev Aug 29, 2014

Choose a reason for hiding this comment

bmagyar Sep 2, 2014

Choose a reason for hiding this comment

bmagyar commented Aug 29, 2014

vpisarev Aug 29, 2014

Choose a reason for hiding this comment

bmagyar Sep 2, 2014

Choose a reason for hiding this comment

bmagyar commented Aug 29, 2014

vpisarev Sep 1, 2014

Choose a reason for hiding this comment

bmagyar Sep 2, 2014

Choose a reason for hiding this comment

vpisarev commented Sep 1, 2014

bmagyar commented Sep 2, 2014

vpisarev commented Sep 2, 2014

bmagyar commented Sep 2, 2014

vpisarev commented Sep 2, 2014

bmagyar commented Sep 2, 2014

bmagyar commented Sep 3, 2014

vpisarev commented Sep 4, 2014

bmagyar commented Sep 4, 2014

tolgabirdal commented Feb 4, 2016

patrycjabb commented Feb 4, 2016

JoyMazumder commented Oct 19, 2018