Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/core/include/opencv2/core.hpp

@@ -73,8 +73,10 @@
     @defgroup core_cluster Clustering
     @defgroup core_utils Utility and system functions and macros
     @{
+        @defgroup core_logging Logging facilities
         @defgroup core_utils_sse SSE utilities
         @defgroup core_utils_neon NEON utilities
+        @defgroup core_utils_vsx VSX utilities
         @defgroup core_utils_softfloat Softfloat support
         @defgroup core_utils_samples Utility functions for OpenCV samples
     @}

modules/core/include/opencv2/core/hal/intrin_vsx.hpp

@@ -1039,6 +1039,15 @@ inline v_float64x2 v_cvt_f64(const v_float32x4& a)
 inline v_float64x2 v_cvt_f64_high(const v_float32x4& a)
 { return v_float64x2(vec_cvfo(vec_mergel(a.val, a.val))); }
 
+// The altivec intrinsic is missing for this 2.06 insn
+inline v_float64x2 v_cvt_f64(const v_int64x2& a)
+{
+vec_double2 out;
+
+__asm__ ("xvcvsxddp %x0,%x1" : "=wa"(out) : "wa"(a.val));
+return v_float64x2(out);
+}
+
 ////////////// Lookup table access ////////////////////
 
 inline v_int8x16 v_lut(const schar* tab, const int* idx)

modules/core/include/opencv2/core/softfloat.hpp

@@ -507,8 +507,8 @@ Special cases:
 */
 CV_EXPORTS softdouble cos( const softdouble& a );
 
-}
+//! @} core_utils_softfloat
 
-//! @}
+} // cv::
 
 #endif

modules/core/include/opencv2/core/utils/logger.hpp

@@ -12,15 +12,13 @@
 #include "logger.defines.hpp"
 #include "logtag.hpp"
 
-//! @addtogroup core_logging
-// This section describes OpenCV logging utilities.
-//
-//! @{
-
 namespace cv {
 namespace utils {
 namespace logging {
 
+//! @addtogroup core_logging
+//! @{
+
 /** Set global logging level
 @return previous logging level
 */
@@ -148,8 +146,8 @@ struct LogTagAuto
 # define CV_LOG_VERBOSE(tag, v, ...)
 #endif
 
-}}} // namespace
-
 //! @}
 
+}}} // namespace
+
 #endif // OPENCV_LOGGER_HPP

modules/core/include/opencv2/core/utils/trace.hpp

@@ -7,15 +7,13 @@
 
 #include <opencv2/core/cvdef.h>
 
-//! @addtogroup core_logging
-// This section describes OpenCV tracing utilities.
-//
-//! @{
-
 namespace cv {
 namespace utils {
 namespace trace {
 
+//! @addtogroup core_logging
+//! @{
+
 //! Macro to trace function
 #define CV_TRACE_FUNCTION()
 
@@ -247,8 +245,8 @@ CV_EXPORTS void traceArg(const TraceArg& arg, double value);
 
 //! @endcond
 
-}}} // namespace
-
 //! @}
 
+}}} // namespace
+
 #endif // OPENCV_TRACE_HPP