Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

typos in comments

Browse Source
pull/4050/head
Dikay900 10 years ago
parent 25b4cface0
commit 7ca0557b40
14 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/calib3d/include/opencv2/calib3d.hpp
  2. 4
      modules/core/include/opencv2/core/matx.hpp
  3. 10
      modules/highgui/src/ppltasks_winrt.h
  4. 2
      modules/imgproc/include/opencv2/imgproc/types_c.h
  5. 8
      modules/imgproc/src/contours.cpp
  6. 4
      modules/imgproc/src/filterengine.hpp
  7. 2
      modules/photo/include/opencv2/photo.hpp
  8. 2
      modules/photo/include/opencv2/photo/cuda.hpp
  9. 4
      modules/ts/include/opencv2/ts.hpp
  10. 2
      modules/videoio/src/cap_gstreamer.cpp
  11. 8
      modules/videoio/src/cap_libv4l.cpp
  12. 4
      modules/videoio/src/cap_mjpeg_encoder.cpp
  13. 8
      modules/videoio/src/cap_v4l.cpp
  14. 10
      modules/videoio/src/ppltasks_winrt.hpp

2
modules/calib3d/include/opencv2/calib3d.hpp
Unescape View File

@ -166,7 +166,7 @@ pattern (every view is described by several 3D-2D point correspondences).
\f[x' = (\theta_d / r) x \\ y' = (\theta_d / r) y \f] \f[x' = (\theta_d / r) x \\ y' = (\theta_d / r) y \f]
Finally, convertion into pixel coordinates: The final pixel coordinates vector [u; v] where: Finally, conversion into pixel coordinates: The final pixel coordinates vector [u; v] where:
\f[u = f_x (x' + \alpha y') + c_x \\ \f[u = f_x (x' + \alpha y') + c_x \\
v = f_y yy + c_y\f] v = f_y yy + c_y\f]

4
modules/core/include/opencv2/core/matx.hpp
Unescape View File

@ -134,7 +134,7 @@ public:
//! dot product computed in double-precision arithmetics //! dot product computed in double-precision arithmetics
double ddot(const Matx<_Tp, m, n>& v) const; double ddot(const Matx<_Tp, m, n>& v) const;
//! convertion to another data type //! conversion to another data type
template<typename T2> operator Matx<T2, m, n>() const; template<typename T2> operator Matx<T2, m, n>() const;
//! change the matrix shape //! change the matrix shape
@ -337,7 +337,7 @@ public:
For other dimensionalities the exception is raised For other dimensionalities the exception is raised
*/ */
Vec cross(const Vec& v) const; Vec cross(const Vec& v) const;
//! convertion to another data type //! conversion to another data type
template<typename T2> operator Vec<T2, cn>() const; template<typename T2> operator Vec<T2, cn>() const;
/*! element access */ /*! element access */

10
modules/highgui/src/ppltasks_winrt.h
Unescape View File

@ -8628,7 +8628,7 @@ auto when_all(_Iterator _Begin, _Iterator _End, Concurrency::cancellation_token
#endif #endif
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8660,7 +8660,7 @@ task<std::vector<_ReturnType>> operator&&(const task<_ReturnType> & _Lhs, const
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8691,7 +8691,7 @@ task<std::vector<_ReturnType>> operator&&(const task<std::vector<_ReturnType>> &
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8722,7 +8722,7 @@ task<std::vector<_ReturnType>> operator&&(const task<_ReturnType> & _Lhs, const
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8754,7 +8754,7 @@ task<std::vector<_ReturnType>> operator&&(const task<std::vector<_ReturnType>> &
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.

2
modules/imgproc/include/opencv2/imgproc/types_c.h
Unescape View File

@ -462,7 +462,7 @@ enum
}; };
/* /*
Internal structure that is used for sequental retrieving contours from the image. Internal structure that is used for sequential retrieving contours from the image.
It supports both hierarchical and plane variants of Suzuki algorithm. It supports both hierarchical and plane variants of Suzuki algorithm.
*/ */
typedef struct _CvContourScanner* CvContourScanner; typedef struct _CvContourScanner* CvContourScanner;

8
modules/imgproc/src/contours.cpp
Unescape View File

@ -125,7 +125,7 @@ _CvContourInfo;
/* /*
Structure that is used for sequental retrieving contours from the image. Structure that is used for sequential retrieving contours from the image.
It supports both hierarchical and plane variants of Suzuki algorithm. It supports both hierarchical and plane variants of Suzuki algorithm.
*/ */
typedef struct _CvContourScanner typedef struct _CvContourScanner
@ -316,7 +316,7 @@ cvStartFindContours( void* _img, CvMemStorage* storage,
tree. The retrieved contour itself is removed from the storage. tree. The retrieved contour itself is removed from the storage.
Here two cases are possible: Here two cases are possible:
2a. If one deals with plane variant of algorithm 2a. If one deals with plane variant of algorithm
(hierarchical strucutre is not reconstructed), (hierarchical structure is not reconstructed),
the contour is removed completely. the contour is removed completely.
2b. In hierarchical case, the header of the contour is not removed. 2b. In hierarchical case, the header of the contour is not removed.
It's marked as "link to contour" and h_next pointer of it is set to It's marked as "link to contour" and h_next pointer of it is set to
@ -328,8 +328,8 @@ cvStartFindContours( void* _img, CvMemStorage* storage,
leaves header if hierarchical (but doesn't mark header as "link"). leaves header if hierarchical (but doesn't mark header as "link").
------------------------------------------------------------------------ ------------------------------------------------------------------------
The 1st variant can be used to retrieve and store all the contours from the image The 1st variant can be used to retrieve and store all the contours from the image
(with optional convertion from chains to contours using some approximation from (with optional conversion from chains to contours using some approximation from
restriced set of methods). Some characteristics of contour can be computed in the restricted set of methods). Some characteristics of contour can be computed in the
same pass. same pass.
The usage scheme can look like: The usage scheme can look like:

4
modules/imgproc/src/filterengine.hpp
Unescape View File

@ -66,7 +66,7 @@ public:
BaseRowFilter(); BaseRowFilter();
//! the destructor //! the destructor
virtual ~BaseRowFilter(); virtual ~BaseRowFilter();
//! the filtering operator. Must be overrided in the derived classes. The horizontal border interpolation is done outside of the class. //! the filtering operator. Must be overridden in the derived classes. The horizontal border interpolation is done outside of the class.
virtual void operator()(const uchar* src, uchar* dst, int width, int cn) = 0; virtual void operator()(const uchar* src, uchar* dst, int width, int cn) = 0;
int ksize; int ksize;
@ -94,7 +94,7 @@ public:
BaseColumnFilter(); BaseColumnFilter();
//! the destructor //! the destructor
virtual ~BaseColumnFilter(); virtual ~BaseColumnFilter();
//! the filtering operator. Must be overrided in the derived classes. The vertical border interpolation is done outside of the class. //! the filtering operator. Must be overridden in the derived classes. The vertical border interpolation is done outside of the class.
virtual void operator()(const uchar** src, uchar* dst, int dststep, int dstcount, int width) = 0; virtual void operator()(const uchar** src, uchar* dst, int dststep, int dstcount, int width) = 0;
//! resets the internal buffers, if any //! resets the internal buffers, if any
virtual void reset(); virtual void reset();

2
modules/photo/include/opencv2/photo.hpp
Unescape View File

@ -180,7 +180,7 @@ denoising time. Recommended value 21 pixels
removes noise but also removes image details, smaller h value preserves details but also preserves removes noise but also removes image details, smaller h value preserves details but also preserves
some noise some noise
@param hColor The same as h but for color components. For most images value equals 10 @param hColor The same as h but for color components. For most images value equals 10
will be enought to remove colored noise and do not distort colors will be enough to remove colored noise and do not distort colors
The function converts image to CIELAB colorspace and then separately denoise L and AB components The function converts image to CIELAB colorspace and then separately denoise L and AB components
with given h parameters using fastNlMeansDenoising function. with given h parameters using fastNlMeansDenoising function.

2
modules/photo/include/opencv2/photo/cuda.hpp
Unescape View File

@ -105,7 +105,7 @@ CV_EXPORTS void fastNlMeansDenoising(InputArray src, OutputArray dst,
@param h_luminance Parameter regulating filter strength. Big h value perfectly removes noise but @param h_luminance Parameter regulating filter strength. Big h value perfectly removes noise but
also removes image details, smaller h value preserves details but also preserves some noise also removes image details, smaller h value preserves details but also preserves some noise
@param photo_render float The same as h but for color components. For most images value equals 10 will be @param photo_render float The same as h but for color components. For most images value equals 10 will be
enought to remove colored noise and do not distort colors enough to remove colored noise and do not distort colors
@param search_window Size in pixels of the window that is used to compute weighted average for @param search_window Size in pixels of the window that is used to compute weighted average for
given pixel. Should be odd. Affect performance linearly: greater search_window - greater given pixel. Should be odd. Affect performance linearly: greater search_window - greater
denoising time. Recommended value 21 pixels denoising time. Recommended value 21 pixels

4
modules/ts/include/opencv2/ts.hpp
Unescape View File

@ -382,7 +382,7 @@ public:
FAIL_HANG=-13, FAIL_HANG=-13,
// unexpected response on passing bad arguments to the tested function // unexpected response on passing bad arguments to the tested function
// (the function crashed, proceed succesfully (while it should not), or returned // (the function crashed, proceed successfully (while it should not), or returned
// error code that is different from what is expected) // error code that is different from what is expected)
FAIL_BAD_ARG_CHECK=-14, FAIL_BAD_ARG_CHECK=-14,
@ -392,7 +392,7 @@ public:
// the test has been skipped because it is not in the selected subset of the tests to run, // the test has been skipped because it is not in the selected subset of the tests to run,
// because it has been run already within the same run with the same parameters, or because // because it has been run already within the same run with the same parameters, or because
// of some other reason and this is not considered as an error. // of some other reason and this is not considered as an error.
// Normally TS::run() (or overrided method in the derived class) takes care of what // Normally TS::run() (or overridden method in the derived class) takes care of what
// needs to be run, so this code should not occur. // needs to be run, so this code should not occur.
SKIPPED=1 SKIPPED=1
}; };

2
modules/videoio/src/cap_gstreamer.cpp
Unescape View File

@ -525,7 +525,7 @@ void CvCapture_GStreamer::newPad(GstElement * /*elem*/,
* \brief CvCapture_GStreamer::open Open the given file with gstreamer * \brief CvCapture_GStreamer::open Open the given file with gstreamer
* \param type CvCapture type. One of CV_CAP_GSTREAMER_* * \param type CvCapture type. One of CV_CAP_GSTREAMER_*
* \param filename Filename to open in case of CV_CAP_GSTREAMER_FILE * \param filename Filename to open in case of CV_CAP_GSTREAMER_FILE
* \return boolean. Specifies if opening was succesful. * \return boolean. Specifies if opening was successful.
* *
* In case of CV_CAP_GSTREAMER_V4L(2), a pipelin is constructed as follows: * In case of CV_CAP_GSTREAMER_V4L(2), a pipelin is constructed as follows:
* v4l2src ! autoconvert ! appsink * v4l2src ! autoconvert ! appsink

8
modules/videoio/src/cap_libv4l.cpp
Unescape View File

@ -102,7 +102,7 @@ I modified the following:
autosetup_capture_mode_v4l2 -> autodetect capture modes for v4l2 autosetup_capture_mode_v4l2 -> autodetect capture modes for v4l2
- Modifications are according with Video4Linux old codes - Modifications are according with Video4Linux old codes
- Video4Linux handling is automatically if it does not recognize a Video4Linux2 device - Video4Linux handling is automatically if it does not recognize a Video4Linux2 device
- Tested succesful with Logitech Quickcam Express (V4L), Creative Vista (V4L) and Genius VideoCam Notebook (V4L2) - Tested successfully with Logitech Quickcam Express (V4L), Creative Vista (V4L) and Genius VideoCam Notebook (V4L2)
- Correct source lines with compiler warning messages - Correct source lines with compiler warning messages
- Information message from v4l/v4l2 detection - Information message from v4l/v4l2 detection
@ -113,7 +113,7 @@ I modified the following:
- SN9C10x chip based webcams support - SN9C10x chip based webcams support
- New methods are internal: - New methods are internal:
bayer2rgb24, sonix_decompress -> decoder routines for SN9C10x decoding from Takafumi Mizuno <taka-qce@ls-a.jp> with his pleasure :) bayer2rgb24, sonix_decompress -> decoder routines for SN9C10x decoding from Takafumi Mizuno <taka-qce@ls-a.jp> with his pleasure :)
- Tested succesful with Genius VideoCam Notebook (V4L2) - Tested successfully with Genius VideoCam Notebook (V4L2)
Sixth Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu Sixth Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu
For Release: OpenCV-Linux Beta5 OpenCV-0.9.7 For Release: OpenCV-Linux Beta5 OpenCV-0.9.7
@ -123,7 +123,7 @@ I added the following:
- Get and change V4L capture controls (hue, saturation, brightness, contrast) - Get and change V4L capture controls (hue, saturation, brightness, contrast)
- New method is internal: - New method is internal:
icvSetControl -> set capture controls icvSetControl -> set capture controls
- Tested succesful with Creative Vista (V4L) - Tested successfully with Creative Vista (V4L)
Seventh Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu Seventh Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu
For Release: OpenCV-Linux Beta5 OpenCV-0.9.7 For Release: OpenCV-Linux Beta5 OpenCV-0.9.7
@ -132,7 +132,7 @@ I added the following:
- Detect, get and change V4L2 capture controls (hue, saturation, brightness, contrast, gain) - Detect, get and change V4L2 capture controls (hue, saturation, brightness, contrast, gain)
- New methods are internal: - New methods are internal:
v4l2_scan_controls_enumerate_menu, v4l2_scan_controls -> detect capture control intervals v4l2_scan_controls_enumerate_menu, v4l2_scan_controls -> detect capture control intervals
- Tested succesful with Genius VideoCam Notebook (V4L2) - Tested successfully with Genius VideoCam Notebook (V4L2)
8th patch: Jan 5, 2006, Olivier.Bornet@idiap.ch 8th patch: Jan 5, 2006, Olivier.Bornet@idiap.ch
Add support of V4L2_PIX_FMT_YUYV and V4L2_PIX_FMT_MJPEG. Add support of V4L2_PIX_FMT_YUYV and V4L2_PIX_FMT_MJPEG.

4
modules/videoio/src/cap_mjpeg_encoder.cpp
Unescape View File

@ -1237,10 +1237,10 @@ void MotionJpegWriter::writeFrameData( const uchar* data, int step, int colorspa
} }
strm.jputShort(0*256 + 63); // start and end of spectral selection - for strm.jputShort(0*256 + 63); // start and end of spectral selection - for
// sequental DCT start is 0 and end is 63 // sequential DCT start is 0 and end is 63
strm.putByte( 0 ); // successive approximation bit position strm.putByte( 0 ); // successive approximation bit position
// high & low - (0,0) for sequental DCT // high & low - (0,0) for sequential DCT
unsigned currval = 0, code = 0, tempval = 0; unsigned currval = 0, code = 0, tempval = 0;
int bit_idx = 32; int bit_idx = 32;

8
modules/videoio/src/cap_v4l.cpp
Unescape View File

@ -102,7 +102,7 @@ I modified the following:
autosetup_capture_mode_v4l2 -> autodetect capture modes for v4l2 autosetup_capture_mode_v4l2 -> autodetect capture modes for v4l2
- Modifications are according with Video4Linux old codes - Modifications are according with Video4Linux old codes
- Video4Linux handling is automatically if it does not recognize a Video4Linux2 device - Video4Linux handling is automatically if it does not recognize a Video4Linux2 device
- Tested succesful with Logitech Quickcam Express (V4L), Creative Vista (V4L) and Genius VideoCam Notebook (V4L2) - Tested successfully with Logitech Quickcam Express (V4L), Creative Vista (V4L) and Genius VideoCam Notebook (V4L2)
- Correct source lines with compiler warning messages - Correct source lines with compiler warning messages
- Information message from v4l/v4l2 detection - Information message from v4l/v4l2 detection
@ -113,7 +113,7 @@ I modified the following:
- SN9C10x chip based webcams support - SN9C10x chip based webcams support
- New methods are internal: - New methods are internal:
bayer2rgb24, sonix_decompress -> decoder routines for SN9C10x decoding from Takafumi Mizuno <taka-qce@ls-a.jp> with his pleasure :) bayer2rgb24, sonix_decompress -> decoder routines for SN9C10x decoding from Takafumi Mizuno <taka-qce@ls-a.jp> with his pleasure :)
- Tested succesful with Genius VideoCam Notebook (V4L2) - Tested successfully with Genius VideoCam Notebook (V4L2)
Sixth Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu Sixth Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu
For Release: OpenCV-Linux Beta5 OpenCV-0.9.7 For Release: OpenCV-Linux Beta5 OpenCV-0.9.7
@ -123,7 +123,7 @@ I added the following:
- Get and change V4L capture controls (hue, saturation, brightness, contrast) - Get and change V4L capture controls (hue, saturation, brightness, contrast)
- New method is internal: - New method is internal:
icvSetControl -> set capture controls icvSetControl -> set capture controls
- Tested succesful with Creative Vista (V4L) - Tested successfully with Creative Vista (V4L)
Seventh Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu Seventh Patch: Sept 10, 2005 Csaba Kertesz sign@freemail.hu
For Release: OpenCV-Linux Beta5 OpenCV-0.9.7 For Release: OpenCV-Linux Beta5 OpenCV-0.9.7
@ -132,7 +132,7 @@ I added the following:
- Detect, get and change V4L2 capture controls (hue, saturation, brightness, contrast, gain) - Detect, get and change V4L2 capture controls (hue, saturation, brightness, contrast, gain)
- New methods are internal: - New methods are internal:
v4l2_scan_controls_enumerate_menu, v4l2_scan_controls -> detect capture control intervals v4l2_scan_controls_enumerate_menu, v4l2_scan_controls -> detect capture control intervals
- Tested succesful with Genius VideoCam Notebook (V4L2) - Tested successfully with Genius VideoCam Notebook (V4L2)
8th patch: Jan 5, 2006, Olivier.Bornet@idiap.ch 8th patch: Jan 5, 2006, Olivier.Bornet@idiap.ch
Add support of V4L2_PIX_FMT_YUYV and V4L2_PIX_FMT_MJPEG. Add support of V4L2_PIX_FMT_YUYV and V4L2_PIX_FMT_MJPEG.

10
modules/videoio/src/ppltasks_winrt.hpp
Unescape View File

@ -8628,7 +8628,7 @@ auto when_all(_Iterator _Begin, _Iterator _End, Concurrency::cancellation_token
#endif #endif
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8660,7 +8660,7 @@ task<std::vector<_ReturnType>> operator&&(const task<_ReturnType> & _Lhs, const
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8691,7 +8691,7 @@ task<std::vector<_ReturnType>> operator&&(const task<std::vector<_ReturnType>> &
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8722,7 +8722,7 @@ task<std::vector<_ReturnType>> operator&&(const task<_ReturnType> & _Lhs, const
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.
@ -8754,7 +8754,7 @@ task<std::vector<_ReturnType>> operator&&(const task<std::vector<_ReturnType>> &
} }
/// <summary> /// <summary>
/// Creates a task that will complete succesfully when both of the tasks supplied as arguments complete successfully. /// Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.
/// </summary> /// </summary>
/// <typeparam name="_ReturnType"> /// <typeparam name="_ReturnType">
/// The type of the returned task. /// The type of the returned task.

Write Preview
Loading…
Cancel
Save