From: Alexander Shishkov Date: Tue, 3 Apr 2012 00:33:33 +0000 (+0000) Subject: merged revisions r7802,r7804,r7805 from 2.4 branch X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~5066 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bfd50e6aeb06d139b2176fb16ccd792080ddd11;p=platform%2Fupstream%2Fopencv.git merged revisions r7802,r7804,r7805 from 2.4 branch --- diff --git a/doc/_themes/blue/layout.html b/doc/_themes/blue/layout.html index 76dceb0..f5b187a 100644 --- a/doc/_themes/blue/layout.html +++ b/doc/_themes/blue/layout.html @@ -1,8 +1,161 @@ -{% extends "basic/layout.html" %} +{# + basic/layout.html + ~~~~~~~~~~~~~~~~~ + Master layout template for Sphinx themes. + + :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{%- block doctype -%} + +{%- endblock %} {% set script_files = script_files + [pathto("_static/insertIframe.js", 1)] %} +{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} +{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} +{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and + (sidebars != []) %} +{%- set url_root = pathto('', 1) %} +{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} + +{%- macro relbar() %} +
+

{{ _('Navigation') }}

+ +
+{%- endmacro %} + +{%- macro sidebar() %} + {%- if render_sidebar %} +
+
+ {%- block sidebarlogo %} + {%- if logo %} + + {%- endif %} + {%- endblock %} + {%- if sidebars == None %} + {%- block sidebarsearch %} + {%- include "searchbox.html" %} + {%- endblock %} + {%- endif %} + {%- if sidebars != None %} + {#- new style sidebar: explicitly include/exclude templates #} + {%- for sidebartemplate in sidebars %} + {%- include sidebartemplate %} + {%- endfor %} + {%- else %} + {#- old style sidebars: using blocks -- should be deprecated #} + {%- block sidebartoc %} + {%- include "localtoc.html" %} + {%- endblock %} + {%- block sidebarrel %} + {%- include "relations.html" %} + {%- endblock %} + {%- block sidebarsourcelink %} + {%- include "sourcelink.html" %} + {%- endblock %} + {%- if customsidebar %} + {%- include customsidebar %} + {%- endif %} + {%- endif %} +
+
+ {%- endif %} +{%- endmacro %} -{% block document %} + + + + {{ metatags }} + {%- if not embedded and docstitle %} + {%- set titlesuffix = " — "|safe + docstitle|e %} + {%- else %} + {%- set titlesuffix = "" %} + {%- endif %} + {%- block htmltitle %} + {{ title|striptags|e }}{{ titlesuffix }} + {%- endblock %} + + + {%- for cssfile in css_files %} + + {%- endfor %} + {%- if not embedded %} + + {%- for scriptfile in script_files %} + + {%- endfor %} + {%- if use_opensearch %} + + {%- endif %} + {%- if favicon %} + + {%- endif %} + {%- endif %} +{%- block linktags %} + {%- if hasdoc('about') %} + + {%- endif %} + {%- if hasdoc('genindex') %} + + {%- endif %} + {%- if hasdoc('search') %} + + {%- endif %} + {%- if hasdoc('copyright') %} + + {%- endif %} + + {%- if parents %} + + {%- endif %} + {%- if next %} + + {%- endif %} + {%- if prev %} + + {%- endif %} +{%- endblock %} +{%- block extrahead %} {% endblock %} + + +{%- block header %}{% endblock %} + +{%- block relbar1 %}{{ relbar() }}{% endblock %} + +{%- block content %} + {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %} + +
+ {% block document %}
{%- if not embedded %}{% if not theme_nosidebar|tobool %}
@@ -33,3 +186,29 @@
{% endblock %} + {%- block sidebar2 %}{{ sidebar() }}{% endblock %} +
+
+{%- endblock %} + +{%- block relbar2 %}{{ relbar() }}{% endblock %} + +{%- block footer %} +
+ {%- if show_copyright %} + {%- if hasdoc('copyright') %} + {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- else %} + {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- endif %} + {%- endif %} + {%- if last_updated %} + {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %} + {%- endif %} + {%- if show_sphinx %} + {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} + {%- endif %} +
+{%- endblock %} + + diff --git a/doc/_themes/blue/static/default.css_t b/doc/_themes/blue/static/default.css_t index 56317cc..37215e1 100644 --- a/doc/_themes/blue/static/default.css_t +++ b/doc/_themes/blue/static/default.css_t @@ -16,6 +16,10 @@ body { padding: 0; } +img.logo { + width: 150px; +} + div.document { background-color: {{ theme_sidebarbgcolor }}; } @@ -284,11 +288,17 @@ dl.function > dt:first-child { margin-bottom: 7px; } -dl.c\:function > dt:first-child { +dl.cfunction > dt:first-child { margin-bottom: 7px; color: #8080B0; } +dl.cfunction > dt:first-child tt.descname +{ + color: #8080B0; +} + + dl.pyfunction > dt:first-child { margin-bottom: 7px; } @@ -298,6 +308,16 @@ dl.pyoldfunction > dt:first-child { color: #8080B0; } +dl.pyoldfunction > dt:first-child tt.descname +{ + color: #8080B0; +} + +dl.pyoldfunction > dt:first-child tt.descclassname +{ + color: #8080B0; +} + dl.jfunction > dt:first-child { margin-bottom: 7px; } diff --git a/doc/conf.py b/doc/conf.py index de83399..a0932df 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'OpenCV' -copyright = u'2011, opencv dev team' +copyright = u'2011-2012, opencv dev team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -56,7 +56,7 @@ version_patch = re.search("^W*#\W*define\W+CV_SUBMINOR_VERSION\W+(\d+)\W*$", ver # The short X.Y version. version = version_major + '.' + version_minor # The full version, including alpha/beta/rc tags. -release = version_major + '.' + version_minor + '.' + version_patch +release = version_major + '.' + version_minor + '.' + version_patch + "-beta" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -117,7 +117,7 @@ html_theme_path = ['_themes'] # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = 'opencv-logo2.png' +html_logo = 'opencv-logo-white.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 diff --git a/doc/opencv-logo-white.png b/doc/opencv-logo-white.png new file mode 100644 index 0000000..3c70984 Binary files /dev/null and b/doc/opencv-logo-white.png differ diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index 92135fe..50ef663 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -54,6 +54,8 @@ extern "C" { #include "ffmpeg_codecs.hpp" +#include + #ifdef WIN32 #define HAVE_FFMPEG_SWSCALE 1 #include