@@ -541,7 +541,7 @@ class VISP_EXPORT vpCircleHoughTransform
541
541
* \param[in] j : The JSON object, resulting from the parsing of a JSON file.
542
542
* \param[out] params : The circle Hough transform parameters that will be initialized from the JSON data.
543
543
*/
544
- inline friend void from_json (const json &j, vpCircleHoughTransformParameters ¶ms)
544
+ friend inline void from_json (const json &j, vpCircleHoughTransformParameters ¶ms)
545
545
{
546
546
std::string filteringAndGradientName = vpImageFilter::vpCannyFilteringAndGradientTypeToString (params.m_filteringAndGradientType );
547
547
filteringAndGradientName = j.value (" filteringAndGradientType" , filteringAndGradientName);
@@ -619,7 +619,7 @@ class VISP_EXPORT vpCircleHoughTransform
619
619
* \param[out] j : A JSON parser object.
620
620
* \param[in] params : The circle Hough transform parameters that will be serialized in the json object.
621
621
*/
622
- inline friend void to_json (json &j, const vpCircleHoughTransformParameters ¶ms)
622
+ friend inline void to_json (json &j, const vpCircleHoughTransformParameters ¶ms)
623
623
{
624
624
std::pair<unsigned int , unsigned int > radiusLimits = { params.m_minRadius , params.m_maxRadius };
625
625
@@ -760,7 +760,7 @@ class VISP_EXPORT vpCircleHoughTransform
760
760
* \param[in] j The JSON object, resulting from the parsing of a JSON file.
761
761
* \param[out] detector The detector, that will be initialized from the JSON data.
762
762
*/
763
- inline friend void from_json (const json &j, vpCircleHoughTransform &detector)
763
+ friend inline void from_json (const json &j, vpCircleHoughTransform &detector)
764
764
{
765
765
detector.m_algoParams = j;
766
766
}
@@ -771,7 +771,7 @@ class VISP_EXPORT vpCircleHoughTransform
771
771
* \param[out] j A JSON parser object.
772
772
* \param[in] detector The vpCircleHoughTransform that must be parsed into JSON format.
773
773
*/
774
- inline friend void to_json (json &j, const vpCircleHoughTransform &detector)
774
+ friend inline void to_json (json &j, const vpCircleHoughTransform &detector)
775
775
{
776
776
j = detector.m_algoParams ;
777
777
}
0 commit comments