Commit 50d1d711 authored by Andrey Kamaev's avatar Andrey Kamaev

Added reference to Nvidia TADP into Android tutorial; refactored both Android…

Added reference to Nvidia TADP into Android tutorial; refactored both Android tutorials; fixed some rst warnings
parent 6287c113
...@@ -309,6 +309,10 @@ ul.simple { ...@@ -309,6 +309,10 @@ ul.simple {
list-style: none; list-style: none;
} }
em.menuselection, em.guilabel {
font-family: {{ theme_guifont }};
}
.enumeratevisibleitemswithsquare ul { .enumeratevisibleitemswithsquare ul {
list-style: square; list-style: square;
margin-bottom: 0px; margin-bottom: 0px;
......
...@@ -27,4 +27,5 @@ feedbacktextcolor = #ffffff ...@@ -27,4 +27,5 @@ feedbacktextcolor = #ffffff
feedbacklinkcolor = #ffffff feedbacklinkcolor = #ffffff
bodyfont = sans-serif bodyfont = sans-serif
headfont = 'Trebuchet MS', sans-serif headfont = 'Trebuchet MS', sans-serif
guifont = "Lucida Sans","Lucida Sans Unicode","Lucida Grande",Verdana,Arial,Helvetica,sans-serif
lang = none lang = none
\ No newline at end of file
...@@ -864,6 +864,13 @@ class DefinitionParser(object): ...@@ -864,6 +864,13 @@ class DefinitionParser(object):
def _parse_type_expr(self): def _parse_type_expr(self):
typename = self._parse_name() typename = self._parse_name()
if typename and self.skip_string('['):
typename.name += '['
if self.match(re.compile(r'\d*')):
typename.name += self.last_match.group(0)
typename.name += ']'
if not self.skip_string(']'):
self.fail('expected type')
self.skip_ws() self.skip_ws()
if not self.skip_string('<'): if not self.skip_string('<'):
return typename return typename
......
...@@ -269,7 +269,7 @@ The function deallocates the buffer allocated with :ocv:func:`fastMalloc` . If N ...@@ -269,7 +269,7 @@ The function deallocates the buffer allocated with :ocv:func:`fastMalloc` . If N
format format
------ ------
Returns a text string formatted using the ``printf`` -like expression. Returns a text string formatted using the ``printf``\ -like expression.
.. ocv:function:: string format( const char* fmt, ... ) .. ocv:function:: string format( const char* fmt, ... )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment