From 9bfd50e6aeb06d139b2176fb16ccd792080ddd11 Mon Sep 17 00:00:00 2001 From: Alexander Shishkov Date: Tue, 3 Apr 2012 00:33:33 +0000 Subject: [PATCH] merged revisions r7802,r7804,r7805 from 2.4 branch --- doc/_themes/blue/layout.html | 183 ++++++++++++++++++++++++++++- doc/_themes/blue/static/default.css_t | 22 +++- doc/conf.py | 6 +- doc/opencv-logo-white.png | Bin 0 -> 8099 bytes modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 2 + 5 files changed, 207 insertions(+), 6 deletions(-) create mode 100644 doc/opencv-logo-white.png 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 0000000000000000000000000000000000000000..3c7098459e04c5d2a3fed7cb883ce985a55456f0 GIT binary patch literal 8099 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 literal 0 HcmV?d00001 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 -- 2.7.4