Skip to content

Commit 1ca7cc0

Browse files
committed
Use friend inline (instead of inline friend) required by the python bindings
1 parent 3e98c2d commit 1ca7cc0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

modules/imgproc/include/visp3/imgproc/vpCircleHoughTransform.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class VISP_EXPORT vpCircleHoughTransform
541541
* \param[in] j : The JSON object, resulting from the parsing of a JSON file.
542542
* \param[out] params : The circle Hough transform parameters that will be initialized from the JSON data.
543543
*/
544-
inline friend void from_json(const json &j, vpCircleHoughTransformParameters &params)
544+
friend inline void from_json(const json &j, vpCircleHoughTransformParameters &params)
545545
{
546546
std::string filteringAndGradientName = vpImageFilter::vpCannyFilteringAndGradientTypeToString(params.m_filteringAndGradientType);
547547
filteringAndGradientName = j.value("filteringAndGradientType", filteringAndGradientName);
@@ -619,7 +619,7 @@ class VISP_EXPORT vpCircleHoughTransform
619619
* \param[out] j : A JSON parser object.
620620
* \param[in] params : The circle Hough transform parameters that will be serialized in the json object.
621621
*/
622-
inline friend void to_json(json &j, const vpCircleHoughTransformParameters &params)
622+
friend inline void to_json(json &j, const vpCircleHoughTransformParameters &params)
623623
{
624624
std::pair<unsigned int, unsigned int> radiusLimits = { params.m_minRadius, params.m_maxRadius };
625625

@@ -760,7 +760,7 @@ class VISP_EXPORT vpCircleHoughTransform
760760
* \param[in] j The JSON object, resulting from the parsing of a JSON file.
761761
* \param[out] detector The detector, that will be initialized from the JSON data.
762762
*/
763-
inline friend void from_json(const json &j, vpCircleHoughTransform &detector)
763+
friend inline void from_json(const json &j, vpCircleHoughTransform &detector)
764764
{
765765
detector.m_algoParams = j;
766766
}
@@ -771,7 +771,7 @@ class VISP_EXPORT vpCircleHoughTransform
771771
* \param[out] j A JSON parser object.
772772
* \param[in] detector The vpCircleHoughTransform that must be parsed into JSON format.
773773
*/
774-
inline friend void to_json(json &j, const vpCircleHoughTransform &detector)
774+
friend inline void to_json(json &j, const vpCircleHoughTransform &detector)
775775
{
776776
j = detector.m_algoParams;
777777
}

0 commit comments

Comments
 (0)