diff --git a/doc/conf.py b/doc/conf.py index 0f13a6d0f4..9c7ec30a58 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -126,7 +126,7 @@ html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. diff --git a/doc/opencv1/c/imgproc_miscellaneous_image_transformations.rst b/doc/opencv1/c/imgproc_miscellaneous_image_transformations.rst index 11a964b9df..0a180b2b79 100644 --- a/doc/opencv1/c/imgproc_miscellaneous_image_transformations.rst +++ b/doc/opencv1/c/imgproc_miscellaneous_image_transformations.rst @@ -648,13 +648,7 @@ The function can do the following transformations: ) The Bayer pattern is widely used in CCD and CMOS cameras. It allows one to get color pictures from a single plane where R,G and B pixels (sensors of a particular component) are interleaved like this: - - - - .. math:: - - \newcommand{\Rcell}{\color{red}R} \newcommand{\Gcell}{\color{green}G} \newcommand{\Bcell}{\color{blue}B} \definecolor{BackGray}{rgb}{0.8,0.8,0.8} \begin{array}{ c c c c c } \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \\ \Gcell & \colorbox{BackGray}{\Bcell} & \colorbox{BackGray}{\Gcell} & \Bcell & \Gcell \\ \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \\ \Gcell & \Bcell & \Gcell & \Bcell & \Gcell \\ \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \end{array} - + .. image:: pics/bayer.png The output RGB components of a pixel are interpolated from 1, 2 or 4 neighbors of the pixel having the same color. There are several diff --git a/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst b/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst index 34ba00448f..a6d2b61870 100644 --- a/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst +++ b/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst @@ -663,14 +663,7 @@ The function can do the following transformations: ``CV_BayerBG2BGR, CV_BayerGB2BGR, CV_BayerRG2BGR, CV_BayerGR2BGR, CV_BayerBG2RGB, CV_BayerGB2RGB, CV_BayerRG2RGB, CV_BayerGR2RGB`` ) The Bayer pattern is widely used in CCD and CMOS cameras. It allows one to get color pictures from a single plane where R,G and B pixels (sensors of a particular component) are interleaved like this: - - - - - .. math:: - - \newcommand{\Rcell}{\color{red}R} \newcommand{\Gcell}{\color{green}G} \newcommand{\Bcell}{\color{blue}B} \definecolor{BackGray}{rgb}{0.8,0.8,0.8} \begin{array}{ c c c c c } \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \\ \Gcell & \colorbox{BackGray}{\Bcell} & \colorbox{BackGray}{\Gcell} & \Bcell & \Gcell \\ \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \\ \Gcell & \Bcell & \Gcell & \Bcell & \Gcell \\ \Rcell & \Gcell & \Rcell & \Gcell & \Rcell \end{array} - + .. image:: pics/bayer.png The output RGB components of a pixel are interpolated from 1, 2 or 4 neighbors of the pixel having the same color. There are several diff --git a/doc/pics/bayer.png b/doc/pics/bayer.png new file mode 100644 index 0000000000..92fe2ddb8b Binary files /dev/null and b/doc/pics/bayer.png differ diff --git a/doc/tutorials/tutorials.rst b/doc/tutorials/tutorials.rst index 9d87694e9c..7d3e303e7d 100644 --- a/doc/tutorials/tutorials.rst +++ b/doc/tutorials/tutorials.rst @@ -1,3 +1,7 @@ +################# +OpenCV Tutorials +################# + The following links describe a set of basic OpenCV tutorials. All the source code mentioned here is provide as part of the OpenCV regular releases, so check before you start copy & pasting the code. The list of tutorials below is automatically generated from reST files located in our SVN repository. .. note::