From d43a57a7be627e5d4934cc9470fe56326153d87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Thu, 22 Mar 2018 22:46:26 +0100 Subject: [PATCH] Make all Params structs and not class --- src/algorithms/activesearch/alg_activesearch.h | 2 +- src/algorithms/algorithm_base.h | 2 +- src/algorithms/opticalflowpyrlk/alg_opticalflowpyrlk.h | 2 +- .../residualtrilinearity/alg_residualtrilinearity.h | 2 +- src/algorithms/trackfeatures/alg_trackfeatures.h | 2 +- src/descriptors/akaze/descriptor_akaze.h | 2 +- src/descriptors/brief/descriptor_brief.h | 2 +- src/descriptors/brisk/descriptor_brisk.h | 2 +- src/descriptors/daisy/descriptor_daisy.h | 2 +- src/descriptors/descriptor_base.h | 2 +- src/descriptors/freak/descriptor_freak.h | 2 +- src/descriptors/kaze/descriptor_kaze.h | 2 +- src/descriptors/latch/descriptor_latch.h | 2 +- src/descriptors/lucid/descriptor_lucid.h | 2 +- src/descriptors/orb/descriptor_orb.h | 2 +- src/descriptors/sift/descriptor_sift.h | 2 +- src/descriptors/surf/descriptor_surf.h | 2 +- src/detectors/agast/detector_agast.h | 2 +- src/detectors/akaze/detector_akaze.h | 2 +- src/detectors/brisk/detector_brisk.h | 2 +- src/detectors/detector_base.h | 2 +- src/detectors/fast/detector_fast.h | 2 +- src/detectors/gftt/detector_gftt.h | 2 +- src/detectors/harris/detector_harris.h | 2 +- src/detectors/kaze/detector_kaze.h | 2 +- src/detectors/mser/detector_mser.h | 2 +- src/detectors/orb/detector_orb.h | 2 +- src/detectors/quickharris/detector_quickharris.h | 2 +- src/detectors/sbd/detector_sbd.h | 2 +- src/detectors/sift/detector_sift.h | 2 +- src/detectors/surf/detector_surf.h | 2 +- src/matchers/bruteforce/matcher_bruteforce.h | 2 +- src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h | 2 +- .../bruteforce_hamming_2/matcher_bruteforce_hamming_2.h | 2 +- src/matchers/bruteforce_l1/matcher_bruteforce_l1.h | 2 +- src/matchers/flannbased/matcher_flannbased.h | 2 +- src/matchers/matcher_base.h | 2 +- src/sensors/sensor_base.h | 2 +- src/sensors/usb_cam/usb_cam.h | 2 +- src/vision_utils.h | 4 ++-- 40 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/algorithms/activesearch/alg_activesearch.h b/src/algorithms/activesearch/alg_activesearch.h index 100d514..a7c1bfa 100644 --- a/src/algorithms/activesearch/alg_activesearch.h +++ b/src/algorithms/activesearch/alg_activesearch.h @@ -14,7 +14,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(AlgorithmACTIVESEARCH); -VU_PTR_TYPEDEFS(AlgorithmParamsACTIVESEARCH); +VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsACTIVESEARCH); /** \brief Class parameters * diff --git a/src/algorithms/algorithm_base.h b/src/algorithms/algorithm_base.h index e8d1745..782b7f5 100644 --- a/src/algorithms/algorithm_base.h +++ b/src/algorithms/algorithm_base.h @@ -13,7 +13,7 @@ namespace vision_utils // Create all pointers VU_PTR_TYPEDEFS(AlgorithmBase); -VU_PTR_TYPEDEFS(AlgorithmParamsBase); +VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsBase); /** \brief Class parameters * diff --git a/src/algorithms/opticalflowpyrlk/alg_opticalflowpyrlk.h b/src/algorithms/opticalflowpyrlk/alg_opticalflowpyrlk.h index 62f689f..74343d0 100644 --- a/src/algorithms/opticalflowpyrlk/alg_opticalflowpyrlk.h +++ b/src/algorithms/opticalflowpyrlk/alg_opticalflowpyrlk.h @@ -14,7 +14,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(AlgorithmOPTFLOWPYRLK); -VU_PTR_TYPEDEFS(AlgorithmParamsOPTFLOWPYRLK); +VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsOPTFLOWPYRLK); /** \brief Class parameters * diff --git a/src/algorithms/residualtrilinearity/alg_residualtrilinearity.h b/src/algorithms/residualtrilinearity/alg_residualtrilinearity.h index 52e1d21..b4be39c 100644 --- a/src/algorithms/residualtrilinearity/alg_residualtrilinearity.h +++ b/src/algorithms/residualtrilinearity/alg_residualtrilinearity.h @@ -10,7 +10,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(AlgorithmRESIDUALTRILINEARITY); -VU_PTR_TYPEDEFS(AlgorithmParamsRESIDUALTRILINEARITY); +VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsRESIDUALTRILINEARITY); /** \brief Class parameters * diff --git a/src/algorithms/trackfeatures/alg_trackfeatures.h b/src/algorithms/trackfeatures/alg_trackfeatures.h index cdc1c87..334bbe5 100644 --- a/src/algorithms/trackfeatures/alg_trackfeatures.h +++ b/src/algorithms/trackfeatures/alg_trackfeatures.h @@ -14,7 +14,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(AlgorithmTRACKFEATURES); -VU_PTR_TYPEDEFS(AlgorithmParamsTRACKFEATURES); +VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsTRACKFEATURES); /** \brief Class parameters * diff --git a/src/descriptors/akaze/descriptor_akaze.h b/src/descriptors/akaze/descriptor_akaze.h index 47c724c..d01dc79 100644 --- a/src/descriptors/akaze/descriptor_akaze.h +++ b/src/descriptors/akaze/descriptor_akaze.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorAKAZE); -VU_PTR_TYPEDEFS(DescriptorParamsAKAZE); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsAKAZE); /** \brief Class parameters * diff --git a/src/descriptors/brief/descriptor_brief.h b/src/descriptors/brief/descriptor_brief.h index 58f45cf..19e21d3 100644 --- a/src/descriptors/brief/descriptor_brief.h +++ b/src/descriptors/brief/descriptor_brief.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorBRIEF); -VU_PTR_TYPEDEFS(DescriptorParamsBRIEF); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBRIEF); /** \brief Class parameters * diff --git a/src/descriptors/brisk/descriptor_brisk.h b/src/descriptors/brisk/descriptor_brisk.h index 34f598e..c92c8e9 100644 --- a/src/descriptors/brisk/descriptor_brisk.h +++ b/src/descriptors/brisk/descriptor_brisk.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorBRISK); -VU_PTR_TYPEDEFS(DescriptorParamsBRISK); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBRISK); /** \brief Class parameters * diff --git a/src/descriptors/daisy/descriptor_daisy.h b/src/descriptors/daisy/descriptor_daisy.h index 1af4d99..193ed2b 100644 --- a/src/descriptors/daisy/descriptor_daisy.h +++ b/src/descriptors/daisy/descriptor_daisy.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorDAISY); -VU_PTR_TYPEDEFS(DescriptorParamsDAISY); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsDAISY); /** \DAISY Class parameters * diff --git a/src/descriptors/descriptor_base.h b/src/descriptors/descriptor_base.h index 948c0e0..7d0c6fd 100644 --- a/src/descriptors/descriptor_base.h +++ b/src/descriptors/descriptor_base.h @@ -15,7 +15,7 @@ namespace vision_utils // Create all pointers VU_PTR_TYPEDEFS(DescriptorBase); -VU_PTR_TYPEDEFS(DescriptorParamsBase); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBase); /** \brief Class parameters * diff --git a/src/descriptors/freak/descriptor_freak.h b/src/descriptors/freak/descriptor_freak.h index 7e15759..516d015 100644 --- a/src/descriptors/freak/descriptor_freak.h +++ b/src/descriptors/freak/descriptor_freak.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorFREAK); -VU_PTR_TYPEDEFS(DescriptorParamsFREAK); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsFREAK); /** \brief Class parameters * diff --git a/src/descriptors/kaze/descriptor_kaze.h b/src/descriptors/kaze/descriptor_kaze.h index b7d81ce..d303756 100644 --- a/src/descriptors/kaze/descriptor_kaze.h +++ b/src/descriptors/kaze/descriptor_kaze.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorKAZE); -VU_PTR_TYPEDEFS(DescriptorParamsKAZE); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsKAZE); /** \brief Class parameters * diff --git a/src/descriptors/latch/descriptor_latch.h b/src/descriptors/latch/descriptor_latch.h index c7fd291..780ae5b 100644 --- a/src/descriptors/latch/descriptor_latch.h +++ b/src/descriptors/latch/descriptor_latch.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorLATCH); -VU_PTR_TYPEDEFS(DescriptorParamsLATCH); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsLATCH); /** \brief Class parameters * diff --git a/src/descriptors/lucid/descriptor_lucid.h b/src/descriptors/lucid/descriptor_lucid.h index ef1dfe0..db43b25 100644 --- a/src/descriptors/lucid/descriptor_lucid.h +++ b/src/descriptors/lucid/descriptor_lucid.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorLUCID); -VU_PTR_TYPEDEFS(DescriptorParamsLUCID); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsLUCID); /** \brief Class parameters * diff --git a/src/descriptors/orb/descriptor_orb.h b/src/descriptors/orb/descriptor_orb.h index 7bfaec2..c01e35e 100644 --- a/src/descriptors/orb/descriptor_orb.h +++ b/src/descriptors/orb/descriptor_orb.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorORB); -VU_PTR_TYPEDEFS(DescriptorParamsORB); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsORB); /** \brief Class parameters * diff --git a/src/descriptors/sift/descriptor_sift.h b/src/descriptors/sift/descriptor_sift.h index e462f2a..ea69e58 100644 --- a/src/descriptors/sift/descriptor_sift.h +++ b/src/descriptors/sift/descriptor_sift.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorSIFT); -VU_PTR_TYPEDEFS(DescriptorParamsSIFT); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsSIFT); /** \brief Class parameters * diff --git a/src/descriptors/surf/descriptor_surf.h b/src/descriptors/surf/descriptor_surf.h index 9f78881..f631e07 100644 --- a/src/descriptors/surf/descriptor_surf.h +++ b/src/descriptors/surf/descriptor_surf.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DescriptorSURF); -VU_PTR_TYPEDEFS(DescriptorParamsSURF); +VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsSURF); /** \brief Class parameters * diff --git a/src/detectors/agast/detector_agast.h b/src/detectors/agast/detector_agast.h index b0a1542..1cd75fa 100644 --- a/src/detectors/agast/detector_agast.h +++ b/src/detectors/agast/detector_agast.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorAGAST); -VU_PTR_TYPEDEFS(DetectorParamsAGAST); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsAGAST); /** \brief Class parameters * diff --git a/src/detectors/akaze/detector_akaze.h b/src/detectors/akaze/detector_akaze.h index 69f49e6..e950b8c 100644 --- a/src/detectors/akaze/detector_akaze.h +++ b/src/detectors/akaze/detector_akaze.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorAKAZE); -VU_PTR_TYPEDEFS(DetectorParamsAKAZE); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsAKAZE); /** \brief Class parameters * diff --git a/src/detectors/brisk/detector_brisk.h b/src/detectors/brisk/detector_brisk.h index 9c1f39c..1431cf0 100644 --- a/src/detectors/brisk/detector_brisk.h +++ b/src/detectors/brisk/detector_brisk.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorBRISK); -VU_PTR_TYPEDEFS(DetectorParamsBRISK); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsBRISK); /** \brief Class parameters * diff --git a/src/detectors/detector_base.h b/src/detectors/detector_base.h index bd55c0a..c4c75ff 100644 --- a/src/detectors/detector_base.h +++ b/src/detectors/detector_base.h @@ -15,7 +15,7 @@ namespace vision_utils // Create all pointers VU_PTR_TYPEDEFS(DetectorBase); -VU_PTR_TYPEDEFS(DetectorParamsBase); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsBase); /** \brief Class parameters * diff --git a/src/detectors/fast/detector_fast.h b/src/detectors/fast/detector_fast.h index 5db5fcb..b9e8044 100644 --- a/src/detectors/fast/detector_fast.h +++ b/src/detectors/fast/detector_fast.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorFAST); -VU_PTR_TYPEDEFS(DetectorParamsFAST); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsFAST); /** \brief Class parameters * diff --git a/src/detectors/gftt/detector_gftt.h b/src/detectors/gftt/detector_gftt.h index 874c604..5932056 100644 --- a/src/detectors/gftt/detector_gftt.h +++ b/src/detectors/gftt/detector_gftt.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorGFTT); -VU_PTR_TYPEDEFS(DetectorParamsGFTT); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsGFTT); /** \brief Class parameters * diff --git a/src/detectors/harris/detector_harris.h b/src/detectors/harris/detector_harris.h index 0a24e2d..b724bea 100644 --- a/src/detectors/harris/detector_harris.h +++ b/src/detectors/harris/detector_harris.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorHARRIS); -VU_PTR_TYPEDEFS(DetectorParamsHARRIS); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsHARRIS); /** \brief Class parameters * diff --git a/src/detectors/kaze/detector_kaze.h b/src/detectors/kaze/detector_kaze.h index 47283de..841d089 100644 --- a/src/detectors/kaze/detector_kaze.h +++ b/src/detectors/kaze/detector_kaze.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorKAZE); -VU_PTR_TYPEDEFS(DetectorParamsKAZE); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsKAZE); /** \brief Class parameters * diff --git a/src/detectors/mser/detector_mser.h b/src/detectors/mser/detector_mser.h index d8b7af3..ef94cce 100644 --- a/src/detectors/mser/detector_mser.h +++ b/src/detectors/mser/detector_mser.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorMSER); -VU_PTR_TYPEDEFS(DetectorParamsMSER); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsMSER); /** \brief Class parameters * diff --git a/src/detectors/orb/detector_orb.h b/src/detectors/orb/detector_orb.h index 5bd6a1d..8fa2c1d 100644 --- a/src/detectors/orb/detector_orb.h +++ b/src/detectors/orb/detector_orb.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorORB); -VU_PTR_TYPEDEFS(DetectorParamsORB); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsORB); /** \brief Class parameters * diff --git a/src/detectors/quickharris/detector_quickharris.h b/src/detectors/quickharris/detector_quickharris.h index 0c985e7..1423b82 100644 --- a/src/detectors/quickharris/detector_quickharris.h +++ b/src/detectors/quickharris/detector_quickharris.h @@ -107,7 +107,7 @@ private: // Create all pointers VU_PTR_TYPEDEFS(DetectorQUICKHARRIS); -VU_PTR_TYPEDEFS(DetectorParamsQUICKHARRIS); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsQUICKHARRIS); /** \brief Class parameters * diff --git a/src/detectors/sbd/detector_sbd.h b/src/detectors/sbd/detector_sbd.h index f0c0a0e..a8f82b6 100644 --- a/src/detectors/sbd/detector_sbd.h +++ b/src/detectors/sbd/detector_sbd.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorSBD); -VU_PTR_TYPEDEFS(DetectorParamsSBD); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsSBD); /** \brief Class parameters * diff --git a/src/detectors/sift/detector_sift.h b/src/detectors/sift/detector_sift.h index fe9f259..8b90266 100644 --- a/src/detectors/sift/detector_sift.h +++ b/src/detectors/sift/detector_sift.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorSIFT); -VU_PTR_TYPEDEFS(DetectorParamsSIFT); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsSIFT); /** \brief Class parameters * diff --git a/src/detectors/surf/detector_surf.h b/src/detectors/surf/detector_surf.h index 30520c7..8c51214 100644 --- a/src/detectors/surf/detector_surf.h +++ b/src/detectors/surf/detector_surf.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(DetectorSURF); -VU_PTR_TYPEDEFS(DetectorParamsSURF); +VU_STRUCT_PTR_TYPEDEFS(DetectorParamsSURF); /** \brief Class parameters * diff --git a/src/matchers/bruteforce/matcher_bruteforce.h b/src/matchers/bruteforce/matcher_bruteforce.h index d08194c..24fb66d 100644 --- a/src/matchers/bruteforce/matcher_bruteforce.h +++ b/src/matchers/bruteforce/matcher_bruteforce.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(MatcherBRUTEFORCE); -VU_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE); /** \brief Class parameters * diff --git a/src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h b/src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h index bf0f86a..1c6ad07 100644 --- a/src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h +++ b/src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(MatcherBRUTEFORCE_HAMMING); -VU_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_HAMMING); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_HAMMING); /** \brief Class parameters * diff --git a/src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h b/src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h index cc3d3b8..9b7e00b 100644 --- a/src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h +++ b/src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(MatcherBRUTEFORCE_HAMMING_2); -VU_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_HAMMING_2); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_HAMMING_2); /** \brief Class parameters * diff --git a/src/matchers/bruteforce_l1/matcher_bruteforce_l1.h b/src/matchers/bruteforce_l1/matcher_bruteforce_l1.h index 8b0b244..e2c44f2 100644 --- a/src/matchers/bruteforce_l1/matcher_bruteforce_l1.h +++ b/src/matchers/bruteforce_l1/matcher_bruteforce_l1.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(MatcherBRUTEFORCE_L1); -VU_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_L1); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsBRUTEFORCE_L1); /** \brief Class parameters * diff --git a/src/matchers/flannbased/matcher_flannbased.h b/src/matchers/flannbased/matcher_flannbased.h index d2a1b3a..d30be93 100644 --- a/src/matchers/flannbased/matcher_flannbased.h +++ b/src/matchers/flannbased/matcher_flannbased.h @@ -8,7 +8,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(MatcherFLANNBASED); -VU_PTR_TYPEDEFS(MatcherParamsFLANNBASED); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsFLANNBASED); /** \brief Class parameters * diff --git a/src/matchers/matcher_base.h b/src/matchers/matcher_base.h index 146a4f5..d6daf08 100644 --- a/src/matchers/matcher_base.h +++ b/src/matchers/matcher_base.h @@ -22,7 +22,7 @@ namespace vision_utils // Create all pointers VU_PTR_TYPEDEFS(MatcherBase); -VU_PTR_TYPEDEFS(MatcherParamsBase); +VU_STRUCT_PTR_TYPEDEFS(MatcherParamsBase); enum MATCH_TYPE{ MATCH = 1, diff --git a/src/sensors/sensor_base.h b/src/sensors/sensor_base.h index c27512f..ee1b885 100644 --- a/src/sensors/sensor_base.h +++ b/src/sensors/sensor_base.h @@ -13,7 +13,7 @@ namespace vision_utils // Create all pointers VU_PTR_TYPEDEFS(SensorBase); -VU_PTR_TYPEDEFS(SensorParamsBase); +VU_STRUCT_PTR_TYPEDEFS(SensorParamsBase); /** \brief Class parameters * diff --git a/src/sensors/usb_cam/usb_cam.h b/src/sensors/usb_cam/usb_cam.h index de3a471..48935ca 100644 --- a/src/sensors/usb_cam/usb_cam.h +++ b/src/sensors/usb_cam/usb_cam.h @@ -7,7 +7,7 @@ namespace vision_utils { // Create all pointers VU_PTR_TYPEDEFS(SensorCamera); -VU_PTR_TYPEDEFS(IntrinsicsCamera); +VU_STRUCT_PTR_TYPEDEFS(IntrinsicsCamera); /** \brief class parameters * diff --git a/src/vision_utils.h b/src/vision_utils.h index d24dfff..2d1fcdc 100644 --- a/src/vision_utils.h +++ b/src/vision_utils.h @@ -143,7 +143,7 @@ namespace vision_utils { * * Derive from this class to create classes of parameters. */ -class ParamsBase { +struct ParamsBase { public: ParamsBase(void) { } @@ -185,7 +185,7 @@ inline double VUBase::getTime(void) }; // Create all pointers -VU_PTR_TYPEDEFS(ParamsBase); +VU_STRUCT_PTR_TYPEDEFS(ParamsBase); VU_PTR_TYPEDEFS(VUBase); ///////////////////////////////////////////////////////////////////////// -- GitLab