Skip to content

Commit 388c56b

Browse files
committed
Move GASDSignature7992 to feature types header
Signed-off-by: Ramir Sultanov <sumir0@proton.me>
1 parent a54455d commit 388c56b

6 files changed

Lines changed: 32 additions & 32 deletions

File tree

common/include/pcl/feature_types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ namespace pcl
121121
* \ingroup common
122122
*/
123123
struct GASDSignature984;
124+
125+
/** \brief Members: float gasd[7992]
126+
* \ingroup common
127+
*/
128+
struct GASDSignature7992;
124129
} // namespace pcl
125130
/** @} */
126131

common/include/pcl/impl/feature_types.hpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ namespace pcl
3535
template<> struct descriptorSize<ESFSignature640> { static constexpr const int value = 640; };
3636
template<> struct descriptorSize<GASDSignature512> { static constexpr const int value = 512; };
3737
template<> struct descriptorSize<GASDSignature984> { static constexpr const int value = 984; };
38+
template<> struct descriptorSize<GASDSignature7992> { static constexpr const int value = 7992; };
3839
}
3940
}
4041
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const MomentInvariants& p);
@@ -414,6 +415,20 @@ namespace pcl
414415

415416
friend std::ostream& operator << (std::ostream& os, const GASDSignature984& p);
416417
};
418+
419+
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const GASDSignature7992& p);
420+
/** \brief A point structure representing the Globally Aligned Spatial Distribution (GASD) shape and color descriptor.
421+
* \ingroup common
422+
*/
423+
struct GASDSignature7992
424+
{
425+
float histogram[7992] = {0.f};
426+
static constexpr int descriptorSize() { return detail::traits::descriptorSize_v<GASDSignature7992>; }
427+
428+
inline constexpr GASDSignature7992 () = default;
429+
430+
friend std::ostream& operator << (std::ostream& os, const GASDSignature7992& p);
431+
};
417432
} // namespace pcl
418433

419434
POINT_CLOUD_REGISTER_POINT_STRUCT (pcl::MomentInvariants,
@@ -534,3 +549,7 @@ POINT_CLOUD_REGISTER_POINT_STRUCT(pcl::GASDSignature512,
534549
POINT_CLOUD_REGISTER_POINT_STRUCT(pcl::GASDSignature984,
535550
(float[984], histogram, gasd)
536551
)
552+
553+
POINT_CLOUD_REGISTER_POINT_STRUCT(pcl::GASDSignature7992,
554+
(float[7992], histogram, gasd)
555+
)

common/include/pcl/impl/point_types.hpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ namespace pcl
158158
namespace traits
159159
{
160160
template<> struct descriptorSize<BRISKSignature512> { static constexpr const int value = 512; };
161-
template<> struct descriptorSize<GASDSignature7992> { static constexpr const int value = 7992; };
162161
template<> struct descriptorSize<GFPFHSignature16> { static constexpr const int value = 16; };
163162
template<> struct descriptorSize<Narf36> { static constexpr const int value = 36; };
164163
template<int N> struct descriptorSize<Histogram<N>> { static constexpr const int value = N; };
@@ -1094,20 +1093,6 @@ namespace pcl
10941093
friend std::ostream& operator << (std::ostream& os, const BRISKSignature512& p);
10951094
};
10961095

1097-
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const GASDSignature7992& p);
1098-
/** \brief A point structure representing the Globally Aligned Spatial Distribution (GASD) shape and color descriptor.
1099-
* \ingroup common
1100-
*/
1101-
struct GASDSignature7992
1102-
{
1103-
float histogram[7992] = {0.f};
1104-
static constexpr int descriptorSize() { return detail::traits::descriptorSize_v<GASDSignature7992>; }
1105-
1106-
inline constexpr GASDSignature7992 () = default;
1107-
1108-
friend std::ostream& operator << (std::ostream& os, const GASDSignature7992& p);
1109-
};
1110-
11111096
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const GFPFHSignature16& p);
11121097
/** \brief A point structure representing the GFPFH descriptor with 16 bins.
11131098
* \ingroup common
@@ -1509,10 +1494,6 @@ POINT_CLOUD_REGISTER_POINT_STRUCT (pcl::BRISKSignature512,
15091494
(unsigned char[64], descriptor, brisk_descriptor512)
15101495
)
15111496

1512-
POINT_CLOUD_REGISTER_POINT_STRUCT(pcl::GASDSignature7992,
1513-
(float[7992], histogram, gasd)
1514-
)
1515-
15161497
POINT_CLOUD_REGISTER_POINT_STRUCT (pcl::Narf36,
15171498
(float[36], descriptor, descriptor)
15181499
)

common/include/pcl/point_types.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,6 @@ namespace pcl
184184
*/
185185
struct PointWithViewpoint;
186186

187-
/** \brief Members: float gasd[7992]
188-
* \ingroup common
189-
*/
190-
struct GASDSignature7992;
191-
192187
/** \brief Members: float histogram[16]
193188
* \ingroup common
194189
*/

common/src/feature_types.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,12 @@ namespace pcl
172172
os << (i == 0 ? "(" : "") << p.histogram[i] << (i < 983 ? ", " : ")");
173173
return (os);
174174
}
175+
176+
std::ostream&
177+
operator << (std::ostream& os, const GASDSignature7992& p)
178+
{
179+
for (int i = 0; i < 7992; ++i)
180+
os << (i == 0 ? "(" : "") << p.histogram[i] << (i < 7991 ? ", " : ")");
181+
return (os);
182+
}
175183
} // namespace pcl

common/src/point_types.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,6 @@ namespace pcl
241241
return (os);
242242
}
243243

244-
std::ostream&
245-
operator << (std::ostream& os, const GASDSignature7992& p)
246-
{
247-
for (int i = 0; i < 7992; ++i)
248-
os << (i == 0 ? "(" : "") << p.histogram[i] << (i < 7991 ? ", " : ")");
249-
return (os);
250-
}
251-
252244
std::ostream&
253245
operator << (std::ostream& os, const GFPFHSignature16& p)
254246
{

0 commit comments

Comments
 (0)