[visp] 02/08: Resolve conflicts taking new release changes
Olivier Sallou
osallou at debian.org
Mon Mar 16 15:07:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
osallou pushed a commit to branch master
in repository visp.
commit 22f2577af89acf993c14cde549ac41f02f422240
Merge: 2517bf6 ef71eca
Author: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Sat Mar 14 18:13:32 2015 +0100
Resolve conflicts taking new release changes
CMakeHeaderFileList.cmake | 22 +-
CMakeLists.txt | 719 +-
CMakeModules/CPackConfigRpm.cmake | 6 +-
CMakeModules/FindCALINUX.cmake | 4 +-
.../{TargetDistclean.cmake => FindDMTX.cmake} | 135 +-
CMakeModules/FindFFMPEG.cmake | 125 +-
CMakeModules/FindGDI.cmake | 19 +-
CMakeModules/FindGSL.cmake | 318 +-
CMakeModules/FindICONV.cmake | 34 +-
CMakeModules/FindIRISA.cmake | 4 +-
CMakeModules/FindLIBFREENECT.cmake | 4 +-
CMakeModules/FindMyJPEG.cmake | 28 +-
CMakeModules/FindMyPNG.cmake | 59 +-
CMakeModules/FindMyZLIB.cmake | 41 +-
CMakeModules/FindOpenCV2.cmake | 2 +-
CMakeModules/FindPTHREAD.cmake | 30 +-
CMakeModules/FindXML2.cmake | 60 +-
.../CMakeLists.txt => CMakeModules/FindZBAR.cmake | 130 +-
CMakeModules/GenerateConfigScript.cmake | 377 -
CMakeModules/OgreTools.cmake | 4 +-
CMakeModules/VISPConfig.cmake | 149 +
CMakeModules/VISPConfig.cmake.in | 205 +-
CMakeModules/VISPConfigVersion.cmake.in | 31 +
CMakeModules/VISPDetectPlatform.cmake | 41 +
CMakeModules/VISPExtraTargets.cmake | 74 +
CMakeModules/VISPGenerateConfig.cmake | 196 +
CMakeModules/VISPGeneratePkgConfigScript.cmake | 332 +
CMakeModules/VISPUse.cmake.in | 13 +-
CMakeModules/resources.cfg.in | 2 +-
CMakeModules/visp-config.bat.in | 6 +-
CMakeModules/visp-config.in | 6 +-
CMakeModules/visp-config.install.in | 10 +-
CMakeSourceFileList.cmake | 82 +-
CTestConfig.cmake | 75 +-
ChangeLog | 76 +-
README.txt | 2 +-
ViSP-third-party.txt.cmake | 2 +
demo/CMakeLists.txt | 6 +-
demo/wireframe-simulator/CMakeLists.txt | 56 +-
demo/wireframe-simulator/servoSimu4Points.cpp | 9 +-
distclean.sh | 178 -
doc/biblio/references.bib | 93 +-
doc/config-doxygen.in | 7 +-
doc/image/img-ViSP-images.jpg | Bin 45225 -> 0 bytes
doc/image/img-ccmake-centos-all.png | Bin 0 -> 78227 bytes
doc/image/img-ccmake-centos.png | Bin 0 -> 65667 bytes
doc/image/img-ccmake-opensuse-all.png | Bin 0 -> 77995 bytes
doc/image/img-ccmake-opensuse.png | Bin 0 -> 64950 bytes
doc/image/img-ccmake-raspberry-pi.png | Bin 0 -> 91849 bytes
doc/image/img-circle.png | Bin 0 -> 14729 bytes
doc/image/img-cmake-win-1.jpg | Bin 45808 -> 0 bytes
doc/image/img-cmake-win-2.jpg | Bin 19213 -> 0 bytes
doc/image/img-cmake-win-4.jpg | Bin 74999 -> 0 bytes
doc/image/img-cmake-win-6.jpg | Bin 84017 -> 0 bytes
doc/image/img-cmake-win-generate.jpg | Bin 74206 -> 0 bytes
doc/image/img-cmake-win-install-prefix.jpg | Bin 78519 -> 0 bytes
doc/image/img-cmake-win-msvc-version.jpg | Bin 26214 -> 0 bytes
doc/image/img-cmake-win-ogre-found-advanced.jpg | Bin 171509 -> 0 bytes
doc/image/img-cmake-win-ogre-found.jpg | Bin 74669 -> 0 bytes
doc/image/img-cmake-win-opencv.jpg | Bin 93814 -> 0 bytes
doc/image/img-cmake-win-solution.jpg | Bin 72496 -> 0 bytes
doc/image/img-cmake-win7-create-build-folder.jpg | Bin 0 -> 17691 bytes
doc/image/img-cmake-win7-generate.jpg | Bin 0 -> 87045 bytes
doc/image/img-cmake-win7-msvc-config-end.jpg | Bin 0 -> 76238 bytes
doc/image/img-cmake-win7-msvc-config.jpg | Bin 0 -> 70074 bytes
doc/image/img-cmake-win7-msvc-launch.jpg | Bin 0 -> 50796 bytes
doc/image/img-cmake-win7-msvc-version.jpg | Bin 0 -> 31876 bytes
doc/image/img-cmake-win7-opencv-advanced.jpg | Bin 0 -> 79725 bytes
doc/image/img-cmake-win7-opencv.jpg | Bin 0 -> 71487 bytes
doc/image/img-cmake-win7-solution.jpg | Bin 0 -> 52671 bytes
doc/image/img-cmake-win8.1-4.jpg | Bin 0 -> 91594 bytes
doc/image/img-cmake-win8.1-6.jpg | Bin 0 -> 104457 bytes
doc/image/img-cmake-win8.1-create-build-folder.jpg | Bin 0 -> 18130 bytes
doc/image/img-cmake-win8.1-gdi.jpg | Bin 0 -> 102805 bytes
doc/image/img-cmake-win8.1-mingw-configure-end.jpg | Bin 0 -> 69684 bytes
doc/image/img-cmake-win8.1-mingw-configure.jpg | Bin 0 -> 63547 bytes
doc/image/img-cmake-win8.1-mingw-generate.jpg | Bin 0 -> 91910 bytes
doc/image/img-cmake-win8.1-mingw-launch.jpg | Bin 0 -> 40873 bytes
...cmake-win8.1-mingw-opencv-detected-advanced.jpg | Bin 0 -> 67753 bytes
.../img-cmake-win8.1-mingw-opencv-detected.jpg | Bin 0 -> 68353 bytes
doc/image/img-cmake-win8.1-mingw-version.jpg | Bin 0 -> 20413 bytes
doc/image/img-cmake-win8.1-msvc-generate.jpg | Bin 0 -> 81061 bytes
doc/image/img-cmake-win8.1-msvc-launch.jpg | Bin 0 -> 41975 bytes
doc/image/img-cmake-win8.1-msvc-version.jpg | Bin 0 -> 29365 bytes
doc/image/img-cmake-win8.1-opencv-advanced.jpg | Bin 0 -> 103997 bytes
doc/image/img-cmake-win8.1-opencv.jpg | Bin 0 -> 95124 bytes
doc/image/img-cmd-displayGDI.jpg | Bin 31133 -> 0 bytes
doc/image/img-cylinder.png | Bin 0 -> 1983 bytes
doc/image/img-detection-datamatrix.png | Bin 0 -> 67997 bytes
doc/image/img-detection-qrcode.png | Bin 0 -> 68137 bytes
doc/image/img-detection-step.png | Bin 0 -> 109480 bytes
...racker.png => img-initClickTemplateTracker.png} | Bin
doc/image/img-learning-step.png | Bin 0 -> 76369 bytes
doc/image/img-mingw64-installer-finished.jpg | Bin 0 -> 54096 bytes
doc/image/img-mingw64-installer-process.jpg | Bin 0 -> 50132 bytes
doc/image/img-mingw64-installer-started.jpg | Bin 0 -> 25233 bytes
doc/image/img-msvc-1.jpg | Bin 50503 -> 0 bytes
doc/image/img-msvc-2.jpg | Bin 87903 -> 0 bytes
doc/image/img-msvc-4.jpg | Bin 86060 -> 0 bytes
doc/image/img-msvc-build.jpg | Bin 84225 -> 0 bytes
doc/image/img-msvc-install-end.jpg | Bin 53337 -> 0 bytes
doc/image/img-msvc-install.jpg | Bin 122557 -> 0 bytes
doc/image/img-msvc-release.jpg | Bin 139436 -> 0 bytes
doc/image/img-opencv-issue-dshow.jpg | Bin 0 -> 57556 bytes
doc/image/img-opencv-issue-ipp.jpg | Bin 0 -> 56459 bytes
doc/image/img-opencv-issue-test-big-endian.jpg | Bin 0 -> 64132 bytes
doc/image/img-opencv-issue-tiff.jpg | Bin 0 -> 99901 bytes
doc/image/img-plane-hierarchical-diagram.jpg | Bin 0 -> 9345 bytes
doc/image/img-raspberry-pi.jpg | Bin 0 -> 20768 bytes
doc/image/img-teabox-click.jpg | Bin 0 -> 23946 bytes
doc/image/img-win-ogre-dir.jpg | Bin 58719 -> 0 bytes
doc/image/img-win-ogre-var.jpg | Bin 26160 -> 0 bytes
doc/image/img-win7-ViSP-images.jpg | Bin 0 -> 35663 bytes
doc/image/img-win7-cmd-displayGDI.jpg | Bin 0 -> 41868 bytes
doc/image/img-win7-msvc-build-succeed.jpg | Bin 0 -> 69012 bytes
doc/image/img-win7-msvc-build.jpg | Bin 0 -> 68478 bytes
doc/image/img-win7-msvc-install-end.jpg | Bin 0 -> 60953 bytes
doc/image/img-win7-msvc-install-succeed.jpg | Bin 0 -> 68875 bytes
doc/image/img-win7-msvc-install.jpg | Bin 0 -> 72183 bytes
doc/image/img-win7-msvc-open.jpg | Bin 0 -> 56691 bytes
doc/image/img-win7-msvc-release.jpg | Bin 0 -> 70813 bytes
doc/image/img-win8.1-cmd-displayGDI.jpg | Bin 0 -> 30915 bytes
doc/image/img-win8.1-cygwin-svn.jpg | Bin 0 -> 55374 bytes
doc/image/img-win8.1-explorer-install-end.jpg | Bin 0 -> 30542 bytes
...win8.1-mingw-opencv-cmake-configure-install.jpg | Bin 0 -> 73947 bytes
.../img-win8.1-mingw-opencv-cmake-configure.jpg | Bin 0 -> 42180 bytes
doc/image/img-win8.1-msvc-build-end.jpg | Bin 0 -> 77917 bytes
doc/image/img-win8.1-msvc-build.jpg | Bin 0 -> 25908 bytes
doc/image/img-win8.1-msvc-install-end.jpg | Bin 0 -> 80293 bytes
doc/image/img-win8.1-msvc-install.jpg | Bin 0 -> 36139 bytes
doc/image/img-win8.1-msvc-open.jpg | Bin 0 -> 51389 bytes
doc/image/img-win8.1-msvc-release.jpg | Bin 0 -> 35398 bytes
doc/image/img-win8.1-msvc-solution.jpg | Bin 0 -> 17582 bytes
doc/image/img-win8.1-visp-images.jpg | Bin 0 -> 51522 bytes
doc/mainpage.doc.in | 92 +-
doc/tutorial-boost-vs.doc | 2 +-
doc/tutorial-calibration.doc | 32 +-
doc/tutorial-detection-barcode.doc | 99 +
doc/tutorial-detection-face.doc | 103 +
doc/tutorial-detection-object.doc | 125 +
doc/tutorial-getting-started-iOS.doc | 2 +-
doc/tutorial-getting-started.doc | 114 +-
doc/tutorial-grabber.doc | 78 +-
doc/tutorial-homography-deprecated.doc | 131 +
doc/tutorial-homography.doc | 179 +-
doc/tutorial-image-filtering.doc | 52 +-
...tall-fedora.doc => tutorial-install-centos.doc} | 141 +-
doc/tutorial-install-fedora.doc | 55 +-
doc/tutorial-install-iOS.doc | 18 +-
...ll-fedora.doc => tutorial-install-opensuse.doc} | 112 +-
doc/tutorial-install-raspberry.doc | 230 +
doc/tutorial-install-ubuntu-package.doc | 89 +
doc/tutorial-install-ubuntu.doc | 53 +-
doc/tutorial-install-win.doc | 193 -
doc/tutorial-install-win7.doc | 201 +
doc/tutorial-install-win8.1-mingw-w64.doc | 319 +
doc/tutorial-install-win8.1-msvc.doc | 211 +
...tching.doc => tutorial-matching-deprecated.doc} | 69 +-
doc/tutorial-matching.doc | 171 +-
doc/tutorial-simu-image.doc | 48 +-
doc/tutorial-trace.doc | 24 +-
doc/tutorial-tracking-blob.doc | 123 +-
doc/tutorial-tracking-keypoint.doc | 168 +-
doc/tutorial-tracking-mb.doc | 482 +-
doc/tutorial-tracking-tt.doc | 53 +-
example/CMakeLists.txt | 7 +-
example/calibration/CMakeLists.txt | 52 +-
example/calibration/camera_calibration.cpp | 27 +-
example/coin-simulator/CMakeLists.txt | 24 +-
.../coin-simulator/simulateCircle2DCamVelocity.cpp | 91 +-
.../simulateFourPoints2DCartesianCamVelocity.cpp | 229 +-
.../simulateFourPoints2DPolarCamVelocity.cpp | 281 +-
example/device/CMakeLists.txt | 7 +-
example/device/display/CMakeLists.txt | 37 +-
example/device/display/displayD3D.cpp | 50 +-
example/device/display/displayGDI.cpp | 50 +-
example/device/display/displayGTK.cpp | 49 +-
example/device/display/displayOpenCV.cpp | 46 +-
example/device/display/displaySequence.cpp | 15 +-
example/device/display/displayX.cpp | 32 +-
example/device/display/displayXMulti.cpp | 23 +-
example/device/framegrabber/CMakeLists.txt | 18 +-
example/device/framegrabber/grabDisk.cpp | 13 +-
example/device/framegrabber/grabOpenCV-2.cpp | 26 +-
example/device/framegrabber/grabOpenCV.cpp | 4 +-
example/device/framegrabber/grabV4l2.cpp | 26 +-
example/device/kinect/CMakeLists.txt | 18 +-
example/device/kinect/kinectAcquisition.cpp | 4 +-
example/device/laserscanner/CMakeLists.txt | 26 +-
example/device/light/CMakeLists.txt | 26 +-
example/direct-visual-servoing/CMakeLists.txt | 26 +-
.../photometricVisualServoing.cpp | 40 +-
example/homography/CMakeLists.txt | 31 +-
example/image/CMakeLists.txt | 20 +-
example/image/imageDiskRW.cpp | 32 +-
example/key-point/CMakeLists.txt | 24 +-
example/key-point/fernClassifier.cpp | 87 +-
example/key-point/keyPointSurf.cpp | 18 +-
example/key-point/planarObjectDetector.cpp | 87 +-
example/manual/CMakeLists.txt | 26 +-
example/manual/hello-world/CMake/CMakeLists.txt | 14 +-
example/manual/hello-world/Makefile/Makefile | 16 +-
example/manual/image-manipulation/manDisplay.cpp | 8 +-
example/manual/ogre/HelloWorldOgre.cpp | 50 +-
example/manual/ogre/HelloWorldOgreAdvanced.cpp | 56 +-
example/math/CMakeLists.txt | 24 +-
example/moments/image/CMakeLists.txt | 36 +-
example/moments/points/CMakeLists.txt | 36 +-
example/moments/polygon/CMakeLists.txt | 36 +-
example/ogre-simulator/AROgre.cpp | 13 +-
example/ogre-simulator/AROgreBasic.cpp | 12 +-
example/ogre-simulator/CMakeLists.txt | 25 +-
example/parse-argv/CMakeLists.txt | 25 +-
example/parse-argv/parse-argv2.cpp | 7 +-
example/pose-estimation/CMakeLists.txt | 23 +-
example/pose-estimation/poseVirtualVS.cpp | 24 +-
example/robot-simulator/afma6/CMakeLists.txt | 25 +-
example/robot-simulator/camera/CMakeLists.txt | 107 +-
.../camera/servoSimuCircle2DCamVelocityDisplay.cpp | 7 +-
.../servoSimuCylinder2DCamVelocityDisplay.cpp | 7 +-
...muCylinder2DCamVelocityDisplaySecondaryTask.cpp | 8 +-
.../servoSimuFourPoints2DCamVelocityDisplay.cpp | 8 +-
...ervoSimuFourPoints2DPolarCamVelocityDisplay.cpp | 12 +-
.../camera/servoSimuLine2DCamVelocityDisplay.cpp | 7 +-
.../servoSimuSquareLine2DCamVelocityDisplay.cpp | 7 +-
example/robot-simulator/viper850/CMakeLists.txt | 25 +-
example/servo-afma4/CMakeLists.txt | 18 +-
example/servo-afma6/CMakeLists.txt | 20 +-
.../servoAfma6Points2DCamVelocityEyeToHand.cpp | 10 +-
example/servo-biclops/CMakeLists.txt | 19 +-
example/servo-pioneer/CMakeLists.txt | 19 +-
example/servo-pioneer/servoPioneerPoint2DDepth.cpp | 4 +-
.../servoPioneerPoint2DDepthWithoutVpServo.cpp | 4 +-
example/servo-pioneer/sonarPioneerReader.cpp | 4 +-
example/servo-ptu46/CMakeLists.txt | 18 +-
example/servo-viper650/CMakeLists.txt | 17 +-
.../servoViper650Point2DCamVelocity.cpp | 2 +-
example/servo-viper850/CMakeLists.txt | 20 +-
...r850Point2DArtVelocity-jointAvoidance-basic.cpp | 4 +-
...per850Point2DArtVelocity-jointAvoidance-gpa.cpp | 4 +-
example/tools/CMakeLists.txt | 28 +-
example/tools/histogram.cpp | 13 +-
example/tools/plot3d.cpp | 18 +-
example/tracking/CMakeLists.txt | 196 +-
example/tracking/mbtEdgeKltTracking.cpp | 160 +-
example/tracking/mbtEdgeTracking.cpp | 170 +-
example/tracking/mbtKltTracking.cpp | 150 +-
example/tracking/templateTracker.cpp | 16 +-
example/tracking/trackDot.cpp | 23 +-
example/tracking/trackDot2.cpp | 22 +-
example/tracking/trackDot2WithAutoDetection.cpp | 24 +-
example/tracking/trackKltOpencv.cpp | 52 +-
example/tracking/trackMeCircle.cpp | 21 +-
example/tracking/trackMeEllipse.cpp | 22 +-
example/tracking/trackMeLine.cpp | 23 +-
example/tracking/trackMeNurbs.cpp | 20 +-
example/video/CMakeLists.txt | 23 +-
example/video/imageSequenceReader.cpp | 11 +-
example/video/videoReader.cpp | 21 +-
example/wireframe-simulator/CMakeLists.txt | 25 +-
include/vpConfig.h.cmake | 39 +-
src/CMakeLists.txt | 95 +-
src/camera/calibration/vpCalibration.cpp | 71 +-
src/camera/calibration/vpCalibration.h | 6 +-
src/camera/vpCameraParameters.cpp | 153 +-
src/camera/vpCameraParameters.h | 102 +-
src/camera/vpMeterPixelConversion.cpp | 46 +-
src/camera/vpMeterPixelConversion.h | 60 +-
src/camera/vpPixelMeterConversion.cpp | 18 +-
src/camera/vpXmlParserCamera.cpp | 25 +-
src/camera/vpXmlParserCamera.h | 6 +-
.../homography-estimation/vpHomographyDLT.cpp | 6 +-
.../homography-estimation/vpHomographyMalis.cpp | 12 +-
.../pose-estimation/vpLevenbergMarquartd.cpp | 20 +-
src/computer-vision/pose-estimation/vpPose.cpp | 15 +-
src/computer-vision/pose-estimation/vpPose.h | 15 +-
.../pose-estimation/vpPoseDementhon.cpp | 56 +-
.../pose-estimation/vpPoseLagrange.cpp | 54 +-
src/computer-vision/pose-estimation/vpPoseLowe.cpp | 16 +-
.../pose-estimation/vpPoseRansac.cpp | 284 +-
src/detection/barcode/vpDetectorDataMatrixCode.cpp | 127 +
src/detection/barcode/vpDetectorDataMatrixCode.h | 122 +
src/detection/barcode/vpDetectorQRCode.cpp | 99 +
src/detection/barcode/vpDetectorQRCode.h | 126 +
src/detection/face/vpDetectorFace.cpp | 129 +
src/detection/face/vpDetectorFace.h | 100 +
src/detection/vpDetectorBase.h | 162 +
src/device/display/vpDisplay.cpp | 776 +-
src/device/display/vpDisplay.h | 146 +-
src/device/display/vpDisplayGTK.cpp | 143 +-
src/device/display/vpDisplayOpenCV.cpp | 944 +-
src/device/display/vpDisplayOpenCV.h | 22 +-
src/device/display/vpDisplayX.cpp | 452 +-
src/device/display/vpDisplayX.h | 11 +-
src/device/display/vpMouseButton.h | 7 +-
src/device/display/windows/vpD3DRenderer.cpp | 22 +-
src/device/display/windows/vpGDIRenderer.cpp | 47 +-
src/device/display/windows/vpWin32API.cpp | 5 +-
src/device/display/windows/vpWin32Window.cpp | 6 +-
src/device/framegrabber/1394/vp1394TwoGrabber.cpp | 14 +-
src/device/framegrabber/OpenCV/vpOpenCVGrabber.cpp | 4 +-
src/device/framegrabber/OpenCV/vpOpenCVGrabber.h | 4 +-
src/device/framegrabber/v4l2/vpV4l2Grabber.cpp | 220 +-
src/device/framegrabber/v4l2/vpV4l2Grabber.h | 46 +-
src/device/kinect/vpKinect.cpp | 11 +-
src/device/light/vpRingLight.cpp | 4 +-
src/image/vpColor.h | 4 +-
src/image/vpImage.h | 184 +-
src/image/vpImageConvert.cpp | 45 +-
src/image/vpImageConvert.h | 20 +-
src/image/vpImageFilter.cpp | 40 +-
src/image/vpImageFilter.h | 2 +-
src/image/vpImageIo.cpp | 147 +-
src/image/vpImagePoint.cpp | 16 +-
src/image/vpImagePoint.h | 6 +-
src/image/vpImageTools.cpp | 12 +-
src/key-point/vpFernClassifier.cpp | 78 +-
src/key-point/vpFernClassifier.h | 50 +-
src/key-point/vpKeyPoint.cpp | 3008 +++
src/key-point/vpKeyPoint.h | 861 +
src/key-point/vpKeyPointSurf.cpp | 4 +-
src/key-point/vpKeyPointSurf.h | 34 +-
src/key-point/vpPlanarObjectDetector.cpp | 4 +-
src/key-point/vpPlanarObjectDetector.h | 6 +-
src/key-point/vpXmlConfigParserKeyPoint.cpp | 426 +
src/key-point/vpXmlConfigParserKeyPoint.h | 269 +
src/math/kalman/vpKalmanFilter.cpp | 15 +-
src/math/matrix/vpColVector.cpp | 174 +-
src/math/matrix/vpColVector.h | 59 +-
src/math/matrix/vpMatrix.cpp | 349 +-
src/math/matrix/vpMatrix.h | 38 +-
src/math/matrix/vpMatrix_covariance.cpp | 38 +-
src/math/matrix/vpMatrix_lu.cpp | 62 +-
src/math/matrix/vpMatrix_svd.cpp | 5 +-
src/math/matrix/vpRowVector.cpp | 138 +-
src/math/matrix/vpRowVector.h | 48 +-
src/math/misc/vpHinkley.cpp | 26 +-
src/math/misc/vpNoise.cpp | 24 +-
src/math/misc/vpNoise.h | 68 +-
src/math/robust/vpRobust.cpp | 38 +-
src/math/robust/vpRobust.h | 6 +-
src/math/robust/vpScale.cpp | 4 +-
src/math/robust/vpScale.h | 4 +-
src/math/spline/vpNurbs.cpp | 4 +-
src/math/transformation/vpHomogeneousMatrix.cpp | 217 +-
src/math/transformation/vpHomogeneousMatrix.h | 36 +-
src/math/transformation/vpRotationMatrix.cpp | 43 +-
src/math/transformation/vpRotationMatrix.h | 41 +-
src/math/transformation/vpThetaUVector.cpp | 20 +-
src/math/transformation/vpThetaUVector.h | 6 +-
src/math/transformation/vpTranslationVector.cpp | 8 +-
.../vpXmlParserHomogeneousMatrix.cpp | 608 +
.../transformation/vpXmlParserHomogeneousMatrix.h | 262 +
src/network/vpNetwork.cpp | 4 +-
src/robot/real-robot/viper/vpRobotViper650.cpp | 73 +-
src/robot/real-robot/viper/vpRobotViper650.h | 8 +-
src/robot/robot/vpRobot.cpp | 17 +-
src/robot/robot/vpRobot.h | 4 +-
.../simulator-robot/vpRobotWireFrameSimulator.cpp | 10 +-
src/robot/simulator-robot/vpSimulatorAfma6.cpp | 2 +-
src/robot/simulator-robot/vpSimulatorViper850.cpp | 4 +-
src/servo/vpAdaptiveGain.cpp | 12 +-
src/servo/vpServo.cpp | 23 +-
src/servo/vpServo.h | 5 +-
src/simulator/coin-simulator/vpSimulator.cpp | 20 +-
src/simulator/image-simulator/vpImageSimulator.cpp | 193 +-
src/simulator/image-simulator/vpImageSimulator.h | 12 +-
src/simulator/ogre-simulator/vpAROgre.cpp | 75 +-
src/simulator/ogre-simulator/vpAROgre.h | 48 +-
.../core/{vpArit.c => vpArit.cpp} | 2 +-
.../core/{vpAritio.c => vpAritio.cpp} | 6 +-
.../core/{vpBound.c => vpBound.cpp} | 2 +-
.../core/{vpBoundio.c => vpBoundio.cpp} | 6 +-
.../core/{vpClipping.c => vpClipping.cpp} | 18 +-
.../core/{vpDisplay.c => vpCoreDisplay.cpp} | 2 +-
.../core/{vpKeyword.c => vpKeyword.cpp} | 18 +-
.../core/{vpLex.c => vpLex.cpp} | 38 +-
src/simulator/wireframe-simulator/core/vpLex.h | 8 +-
.../core/{vpMyio.c => vpMyio.cpp} | 2 +-
.../core/{vpParser.c => vpParser.cpp} | 2 +-
.../core/{vpProjection.c => vpProjection.cpp} | 6 +-
.../core/{vpRfstack.c => vpRfstack.cpp} | 4 +-
.../core/{vpSkipio.c => vpSkipio.cpp} | 6 +-
src/simulator/wireframe-simulator/core/vpSkipio.h | 4 +-
.../core/{vpTmstack.c => vpTmstack.cpp} | 2 +-
.../core/{vpToken.c => vpToken.cpp} | 2 +-
src/simulator/wireframe-simulator/core/vpToken.h | 4 +-
.../core/{vpViewio.c => vpViewio.cpp} | 2 +-
.../core/{vpVwstack.c => vpVwstack.cpp} | 12 +-
.../wireframe-simulator/vpWireFrameSimulator.cpp | 9 +-
.../wireframe-simulator/vpWireFrameSimulator.h | 38 +-
src/tools/convert/vpConvert.cpp | 435 +
src/tools/convert/vpConvert.h | 112 +
src/tools/geometry/vpPlane.cpp | 72 +-
src/tools/geometry/vpPlane.h | 12 +-
src/tools/geometry/vpRect.cpp | 74 +-
src/tools/geometry/vpRect.h | 25 +-
src/tools/io/vpIoTools.cpp | 391 +-
src/tools/io/vpIoTools.h | 30 +-
src/tools/io/vpParallelPort.cpp | 4 +-
src/tools/io/vpParallelPortException.h | 14 +-
src/tools/io/vpParseArgv.cpp | 32 +-
src/tools/mutex/vpMutex.h | 4 +-
src/tools/plot/vpPlot.cpp | 25 +-
src/tools/plot/vpPlot.h | 6 +-
src/tools/plot/vpPlotGraph.cpp | 25 +-
src/tools/plot/vpPlotGraph.h | 9 +-
src/tracking/dots/vpDot.cpp | 66 +-
src/tracking/dots/vpDot.h | 7 +-
src/tracking/dots/vpDot2.cpp | 24 +-
src/tracking/dots/vpDot2.h | 6 +-
src/tracking/forward-projection/vpCircle.cpp | 60 +-
src/tracking/forward-projection/vpCircle.h | 16 +-
src/tracking/forward-projection/vpCylinder.cpp | 4 +-
src/tracking/klt/vpKltOpencv.cpp | 705 +-
src/tracking/klt/vpKltOpencv.h | 142 +-
src/tracking/mbt/edge/vpMbEdgeTracker.cpp | 1050 +-
src/tracking/mbt/edge/vpMbEdgeTracker.h | 257 +-
src/tracking/mbt/edge/vpMbtDistanceCircle.cpp | 430 +
.../{vpMbtDistanceLine.h => vpMbtDistanceCircle.h} | 158 +-
src/tracking/mbt/edge/vpMbtDistanceCylinder.cpp | 576 +-
src/tracking/mbt/edge/vpMbtDistanceCylinder.h | 30 +-
src/tracking/mbt/edge/vpMbtDistanceLine.cpp | 26 +-
src/tracking/mbt/edge/vpMbtDistanceLine.h | 8 +-
src/tracking/mbt/edge/vpMbtMeEllipse.cpp | 359 +
.../vpMeEllipse.h => mbt/edge/vpMbtMeEllipse.h} | 215 +-
src/tracking/mbt/edge/vpMbtMeLine.cpp | 111 +-
src/tracking/mbt/edge/vpMbtMeLine.h | 6 +-
src/tracking/mbt/edge/vpMbtXmlParser.cpp | 70 +-
src/tracking/mbt/edge/vpMbtXmlParser.h | 53 +-
src/tracking/mbt/hybrid/vpMbEdgeKltTracker.cpp | 501 +-
src/tracking/mbt/hybrid/vpMbEdgeKltTracker.h | 85 +-
src/tracking/mbt/klt/vpMbKltTracker.cpp | 750 +-
src/tracking/mbt/klt/vpMbKltTracker.h | 147 +-
...btKltPolygon.cpp => vpMbtDistanceKltPoints.cpp} | 212 +-
...{vpMbtKltPolygon.h => vpMbtDistanceKltPoints.h} | 114 +-
src/tracking/mbt/klt/vpMbtKltXmlParser.cpp | 6 +-
src/tracking/mbt/vpMbHiddenFaces.h | 239 +-
src/tracking/mbt/vpMbTracker.cpp | 1721 +-
src/tracking/mbt/vpMbTracker.h | 315 +-
src/tracking/mbt/{edge => }/vpMbtPolygon.cpp | 510 +-
src/tracking/mbt/{edge => }/vpMbtPolygon.h | 74 +-
src/tracking/moments/vpMoment.cpp | 10 +-
src/tracking/moments/vpMoment.h | 7 +-
src/tracking/moments/vpMomentAlpha.cpp | 23 +-
src/tracking/moments/vpMomentAlpha.h | 5 +-
src/tracking/moments/vpMomentArea.cpp | 26 +-
src/tracking/moments/vpMomentArea.h | 1 +
src/tracking/moments/vpMomentAreaNormalized.cpp | 32 +-
src/tracking/moments/vpMomentAreaNormalized.h | 3 +-
src/tracking/moments/vpMomentBasic.cpp | 19 +-
src/tracking/moments/vpMomentBasic.h | 6 +-
src/tracking/moments/vpMomentCInvariant.cpp | 19 +-
src/tracking/moments/vpMomentCInvariant.h | 7 +-
src/tracking/moments/vpMomentCentered.cpp | 49 +-
src/tracking/moments/vpMomentCentered.h | 6 +-
src/tracking/moments/vpMomentGravityCenter.cpp | 17 +-
src/tracking/moments/vpMomentGravityCenter.h | 3 +-
.../moments/vpMomentGravityCenterNormalized.cpp | 25 +-
.../moments/vpMomentGravityCenterNormalized.h | 3 +-
src/tracking/moments/vpMomentObject.cpp | 102 +-
src/tracking/moments/vpMomentObject.h | 53 +-
src/tracking/moving-edges/vpMe.cpp | 36 +-
src/tracking/moving-edges/vpMeEllipse.cpp | 106 +-
src/tracking/moving-edges/vpMeEllipse.h | 21 +-
src/tracking/moving-edges/vpMeNurbs.cpp | 21 +-
src/tracking/moving-edges/vpMeSite.h | 4 +-
src/tracking/moving-edges/vpMeTracker.cpp | 13 +-
src/tracking/moving-edges/vpMeTracker.h | 4 +-
.../template-tracker/ssd/vpTemplateTrackerSSD.cpp | 4 +-
.../template-tracker/ssd/vpTemplateTrackerSSD.h | 3 +-
.../ssd/vpTemplateTrackerSSDESM.cpp | 22 +-
.../ssd/vpTemplateTrackerSSDForwardAdditional.cpp | 14 +-
.../vpTemplateTrackerSSDForwardCompositional.cpp | 15 +-
.../vpTemplateTrackerSSDInverseCompositional.cpp | 13 +-
.../tools/vpTemplateTrackerTriangle.cpp | 18 +-
.../tools/vpTemplateTrackerTriangle.h | 12 +-
.../tools/vpTemplateTrackerZone.cpp | 93 +-
.../template-tracker/tools/vpTemplateTrackerZone.h | 5 +-
.../template-tracker/vpTemplateTracker.cpp | 322 +-
src/tracking/template-tracker/vpTemplateTracker.h | 23 +-
.../warp/vpTemplateTrackerWarp.cpp | 12 +-
.../warp/vpTemplateTrackerWarpHomographySL3.cpp | 8 +-
.../zncc/vpTemplateTrackerZNCC.cpp | 4 +-
.../template-tracker/zncc/vpTemplateTrackerZNCC.h | 3 +-
.../vpTemplateTrackerZNCCForwardAdditional.cpp | 10 +-
.../vpTemplateTrackerZNCCInverseCompositional.cpp | 6 +-
src/video/vpFFMPEG.cpp | 33 +-
src/video/vpVideoReader.cpp | 1043 +-
src/video/vpVideoReader.h | 32 +-
src/video/vpVideoWriter.cpp | 114 +-
src/video/vpVideoWriter.h | 39 +-
src/visual-feature/vpBasicFeature.cpp | 16 +-
src/visual-feature/vpBasicFeature.h | 4 +-
src/visual-feature/vpFeatureDepth.h | 9 +-
src/visual-feature/vpFeatureDisplay.cpp | 204 +-
src/visual-feature/vpFeatureEllipse.h | 10 +-
src/visual-feature/vpFeatureLine.h | 6 +-
src/visual-feature/vpFeatureLuminance.cpp | 7 +-
src/visual-feature/vpFeatureLuminance.h | 6 +-
src/visual-feature/vpFeatureMoment.cpp | 25 +-
src/visual-feature/vpFeatureMoment.h | 4 +-
src/visual-feature/vpFeatureMomentArea.cpp | 4 +-
src/visual-feature/vpFeatureMomentCInvariant.cpp | 56 +-
src/visual-feature/vpFeatureMomentCInvariant.h | 14 +-
src/visual-feature/vpFeatureMomentCentered.cpp | 417 +-
src/visual-feature/vpFeatureMomentCentered.h | 72 +-
src/visual-feature/vpFeatureMomentDatabase.h | 6 +-
src/visual-feature/vpFeaturePoint.h | 4 +-
src/visual-feature/vpFeaturePoint3D.h | 4 +-
src/visual-feature/vpFeaturePointPolar.h | 4 +-
src/visual-feature/vpFeatureSegment.h | 2 +-
src/visual-feature/vpFeatureThetaU.h | 5 +-
src/visual-feature/vpFeatureTranslation.h | 4 +-
src/visual-feature/vpFeatureVanishingPoint.h | 10 +-
test/camera/CMakeLists.txt | 25 +-
test/device/CMakeLists.txt | 5 -
test/device/display/CMakeLists.txt | 35 +-
test/device/display/testClick.cpp | 14 +-
test/device/display/testDisplayRoi.cpp | 209 +
test/device/display/testDisplays.cpp | 22 +-
test/device/display/testMouseEvent.cpp | 197 +-
test/device/display/testVideoDevice.cpp | 15 +-
test/device/display/testVideoDeviceDual.cpp | 4 +-
test/device/framegrabber/CMakeLists.txt | 25 +-
test/feature/CMakeLists.txt | 25 +-
test/homography/CMakeLists.txt | 25 +-
test/homography/testDisplacement.cpp | 8 +-
test/image/CMakeLists.txt | 35 +-
test/image/testConversion.cpp | 76 +-
test/image/testCreateSubImage.cpp | 15 +-
test/image/testIoPGM.cpp | 18 +-
test/image/testIoPPM.cpp | 26 +-
test/image/testReadImage.cpp | 28 +-
test/image/testUndistortImage.cpp | 18 +-
test/key-point/CMakeLists.txt | 26 +-
test/key-point/testSurfKeyPoint.cpp | 18 +-
test/math/CMakeLists.txt | 25 +-
test/math/testMatrix.cpp | 281 +-
test/network/CMakeLists.txt | 18 +-
test/pose/CMakeLists.txt | 25 +-
test/servo-afma4/CMakeLists.txt | 25 +-
test/servo-afma6/CMakeLists.txt | 29 +-
test/servo-viper/CMakeLists.txt | 27 +-
test/tools/CMakeLists.txt | 9 +-
test/tools/{xml => convert}/CMakeLists.txt | 27 +-
test/tools/convert/testConvert.cpp | 325 +
test/tools/geometry/CMakeLists.txt | 23 +-
test/tools/geometry/testPolygon.cpp | 11 +-
test/tools/{xml => io}/CMakeLists.txt | 27 +-
test/tools/io/testIoTools.cpp | 446 +
test/tools/time/CMakeLists.txt | 25 +-
test/tools/xml/CMakeLists.txt | 25 +-
test/tools/xml/testXmlParser.cpp | 10 +-
test/tracking/CMakeLists.txt | 28 +-
test/tracking/testTrackDot.cpp | 12 +-
test/visual-feature/CMakeLists.txt | 28 +-
test/visual-feature/testFeatureSegment.cpp | 18 +-
tutorial/CMakeLists.txt | 27 +-
tutorial/computer-vision/CMakeLists.txt | 3 +
.../tutorial-homography-from-points.cpp | 21 +-
.../tutorial-pose-from-points-image.cpp | 18 +-
.../tutorial-pose-from-points-tracking.cpp | 42 +-
tutorial/detection/barcode/CMakeLists.txt | 24 +
tutorial/detection/barcode/bar-code.pgm | 215 +
.../barcode/tutorial-barcode-detector-live.cpp | 121 +
.../barcode/tutorial-barcode-detector.cpp | 105 +
tutorial/detection/face/CMakeLists.txt | 26 +
.../detection/face/haarcascade_frontalface_alt.xml | 26161 +++++++++++++++++++
.../detection/face/tutorial-face-detector-live.cpp | 101 +
tutorial/detection/face/tutorial-face-detector.cpp | 94 +
tutorial/detection/face/video.mpeg | Bin 0 -> 329728 bytes
tutorial/{ => detection}/matching/CMakeLists.txt | 12 +-
.../matching/tutorial-matching-keypoint-SIFT.cpp | 84 +
.../tutorial-matching-keypoint-homography.cpp} | 64 +-
.../matching/tutorial-matching-keypoint.cpp | 81 +
.../tutorial-matching-surf-deprecated.cpp} | 29 +-
...torial-matching-surf-homography-deprecated.cpp} | 31 +-
.../{ => detection}/matching/video-postcard.mpeg | Bin
.../edges => detection/object}/CMakeLists.txt | 21 +-
.../detection/object/detection-config-SIFT.xml | 25 +
tutorial/detection/object/detection-config.xml | 25 +
tutorial/detection/object/teabox.cao | 27 +
tutorial/detection/object/teabox.init | 5 +
tutorial/detection/object/teabox.mpg | Bin 0 -> 239076 bytes
tutorial/detection/object/teabox.wrl | 33 +
tutorial/detection/object/teabox.xml | 27 +
.../object/tutorial-detection-object-mbt.cpp | 241 +
tutorial/grabber/CMakeLists.txt | 11 +-
tutorial/grabber/tutorial-grabber-1394.cpp | 12 +-
tutorial/grabber/tutorial-grabber-opencv-bis.cpp | 4 +-
tutorial/grabber/tutorial-grabber-opencv.cpp | 2 +-
tutorial/grabber/tutorial-grabber-video.cpp | 37 -
tutorial/grabber/tutorial-video-reader.cpp | 80 +
tutorial/grabber/tutorial-video-recorder.cpp | 122 +
tutorial/image/CMakeLists.txt | 3 +
tutorial/image/tutorial-image-converter.cpp | 4 +
tutorial/image/tutorial-image-filter.cpp | 22 +-
tutorial/image/tutorial-image-reader.cpp | 2 +-
tutorial/image/tutorial-image-viewer.cpp | 5 +-
tutorial/image/tutorial-undistort.cpp | 10 +-
tutorial/image/tutorial-viewer.cpp | 18 +-
tutorial/robot/pioneer/CMakeLists.txt | 3 +
...orial-simu-pioneer-continuous-gain-adaptive.cpp | 2 +-
...orial-simu-pioneer-continuous-gain-constant.cpp | 2 +-
.../robot/pioneer/tutorial-simu-pioneer-pan.cpp | 2 +-
tutorial/robot/pioneer/tutorial-simu-pioneer.cpp | 2 +-
tutorial/simulator/image/CMakeLists.txt | 3 +
.../simulator/image/tutorial-image-simulator.cpp | 23 +-
tutorial/trace/CMakeLists.txt | 5 +-
tutorial/tracking/blob/CMakeLists.txt | 8 +-
.../tracking/blob/tutorial-blob-auto-tracker.cpp | 17 +-
.../blob/tutorial-blob-tracker-live-firewire.cpp | 82 +
.../blob/tutorial-blob-tracker-live-v4l2.cpp | 72 +
tutorial/tracking/blob/tutorial-blob-tracker.cpp | 52 -
tutorial/tracking/keypoint/CMakeLists.txt | 7 +-
.../keypoint/tutorial-klt-tracker-live-v4l2.cpp | 126 +
.../keypoint/tutorial-klt-tracker-with-reinit.cpp | 150 +
.../tracking/keypoint/tutorial-klt-tracker.cpp | 115 +-
tutorial/tracking/model-based/edges/CMakeLists.txt | 6 +-
tutorial/tracking/model-based/edges/teabox.cao | 25 +-
tutorial/tracking/model-based/edges/teabox.init | 11 +-
tutorial/tracking/model-based/edges/teabox.mpg | Bin 0 -> 239076 bytes
tutorial/tracking/model-based/edges/teabox.pgm | 73 -
tutorial/tracking/model-based/edges/teabox.ppm | 5 +
.../model-based/edges/tutorial-mb-edge-tracker.cpp | 147 +-
.../tracking/model-based/hybrid/CMakeLists.txt | 6 +-
.../model-based/hybrid/teabox-triangle.cao | 34 +-
tutorial/tracking/model-based/hybrid/teabox.cao | 25 +-
tutorial/tracking/model-based/hybrid/teabox.init | 11 +-
tutorial/tracking/model-based/hybrid/teabox.mpg | Bin 0 -> 239076 bytes
tutorial/tracking/model-based/hybrid/teabox.pgm | 73 -
tutorial/tracking/model-based/hybrid/teabox.ppm | 5 +
.../hybrid/tutorial-mb-hybrid-tracker.cpp | 118 +-
.../tracking/model-based/keypoint/CMakeLists.txt | 6 +-
.../model-based/keypoint/teabox-triangle.cao | 25 +-
tutorial/tracking/model-based/keypoint/teabox.cao | 25 +-
tutorial/tracking/model-based/keypoint/teabox.init | 11 +-
tutorial/tracking/model-based/keypoint/teabox.mpg | Bin 0 -> 239076 bytes
tutorial/tracking/model-based/keypoint/teabox.pgm | 73 -
tutorial/tracking/model-based/keypoint/teabox.ppm | 5 +
.../keypoint/tutorial-mb-klt-tracker.cpp | 109 +-
tutorial/tracking/moving-edges/CMakeLists.txt | 3 +
.../moving-edges/tutorial-me-ellipse-tracker.cpp | 3 +
.../moving-edges/tutorial-me-line-tracker.cpp | 3 +
tutorial/tracking/template-tracker/CMakeLists.txt | 5 +-
tutorial/tracking/template-tracker/bruegel.mpg | Bin 0 -> 1224704 bytes
.../template-tracker/pattern-template-tracker.pgm | 4440 ----
.../template-tracker/tutorial-template-tracker.cpp | 55 +-
tutorial/visual-servo/ibvs/CMakeLists.txt | 3 +
.../ibvs/tutorial-ibvs-4pts-display.cpp | 4 +
.../ibvs/tutorial-ibvs-4pts-image-tracking.cpp | 12 +-
.../ibvs/tutorial-ibvs-4pts-ogre-tracking.cpp | 9 +-
.../ibvs/tutorial-ibvs-4pts-wireframe-camera.cpp | 4 +
.../tutorial-ibvs-4pts-wireframe-robot-afma6.cpp | 7 +-
.../tutorial-ibvs-4pts-wireframe-robot-viper.cpp | 7 +-
656 files changed, 58058 insertions(+), 15994 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git
More information about the debian-science-commits
mailing list