From 400dbb13db63ceb69d26377372d546f8308b900f Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 30 Mar 2011 12:27:31 +0000 Subject: [PATCH] fixed remaining ?? --- modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst | 4 +--- modules/gpu/doc/feature_detection_and_description.rst | 2 +- modules/gpu/doc/initalization_and_information.rst | 10 +++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst b/modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst index 02c9244..d45e206 100644 --- a/modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst +++ b/modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst @@ -340,9 +340,7 @@ gpu::StereoConstantSpaceBP::StereoConstantSpaceBP DiscTerm = \min (disc \_ single \_ jump \cdot \lvert f_1-f_2 \rvert , max \_ disc \_ term) -For more details, see -qx_csbp ?? -. +For more details, see [Q. Yang, L. Wang, and N. Ahuja. A constant-space belief propagation algorithm for stereo matching. In CVPR, 2010]. By default, ``StereoConstantSpaceBP`` uses floating-point arithmetics and the ``CV_32FC1`` type for messages. But it can also use fixed-point arithmetics and the ``CV_16SC1`` message type for better perfomance. To avoid an overflow in this case, the parameters must satisfy the following requirement: diff --git a/modules/gpu/doc/feature_detection_and_description.rst b/modules/gpu/doc/feature_detection_and_description.rst index b6aaf1f..db88c0b 100644 --- a/modules/gpu/doc/feature_detection_and_description.rst +++ b/modules/gpu/doc/feature_detection_and_description.rst @@ -223,7 +223,7 @@ gpu::BruteForceMatcher_GPU::matchCollection :param distance: The output single-row ``CV_32FC1`` matrix that contains the best distance for each query. If some query descriptors are masked out in ``maskCollection`` , it contains ``FLT_MAX``. - :param maskCollection: ``GpuMat`` containing a set of masks. It can be obtained from ``std::vector`` by ?? or it may contain a user-defined mask set. This is an empty matrix or one-row matrix where each element is a ``PtrStep`` that points to one mask. + :param maskCollection: ``GpuMat`` containing a set of masks. It can be obtained from ``std::vector`` by :cpp:func:`gpu::BruteForceMatcher_GPU::makeGpuCollection` or it may contain a user-defined mask set. This is an empty matrix or one-row matrix where each element is a ``PtrStep`` that points to one mask. .. index:: gpu::BruteForceMatcher_GPU::makeGpuCollection diff --git a/modules/gpu/doc/initalization_and_information.rst b/modules/gpu/doc/initalization_and_information.rst index 6f117a5..99b2a7f 100644 --- a/modules/gpu/doc/initalization_and_information.rst +++ b/modules/gpu/doc/initalization_and_information.rst @@ -33,7 +33,7 @@ gpu::getDevice gpu::GpuFeature --------------- -.. c:type:: gpu::GpuFeature +.. cpp:class:: gpu::GpuFeature This class provides GPU computing features. :: @@ -146,7 +146,7 @@ gpu::DeviceInfo::supports Provides information on GPU feature support. This function returns true if the device has the specified GPU feature, otherwise returns false. - :param feature: Feature to be checked. See ?. + :param feature: Feature to be checked. See :cpp:class:`gpu::GpuFeature`. .. index:: gpu::DeviceInfo::isCompatible @@ -170,7 +170,7 @@ The following method checks whether the module was built with the support of the .. cpp:function:: static bool gpu::TargetArchs::builtWith(GpuFeature feature) - :param feature: Feature to be checked. See ?. + :param feature: Feature to be checked. See :cpp:class:`gpu::GpuFeature`. There is a set of methods to check whether the module contains intermediate (PTX) or binary GPU code for the given architecture(s): @@ -188,9 +188,9 @@ There is a set of methods to check whether the module contains intermediate (PTX .. cpp:function:: static bool gpu::TargetArchs::hasEqualOrGreaterBin(int major, int minor) - * **major** Major compute capability version. + :param major: Major compute capability version. - * **minor** Minor compute capability version. + :param minor: Minor compute capability version. According to the CUDA C Programming Guide Version 3.2: "PTX code produced for some specific compute capability can always be compiled to binary code of greater or equal compute capability". -- 2.7.4