ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'multi-server' into newpointone 

Conflicts:
	src/zm_monitor.cpp
pull/1210/head
Isaac Connor 2015-12-28 13:13:15 -05:00
parent 63352ac7c9 f357ea6ccd
commit 98b6ef36d4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/conf.py
View File

@ -103,8 +103,8 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
#html_theme = 'default' html_theme = 'default'
html_theme = 'sphinx_rtd_theme' #html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the

1
src/zm_monitor.cpp
View File

@ -2802,6 +2802,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
signal_check_colour = strtol(dbrow[col]+1,0,16); signal_check_colour = strtol(dbrow[col]+1,0,16);
else else
signal_check_colour = strtol(dbrow[col],0,16); signal_check_colour = strtol(dbrow[col],0,16);
col++;
bool embed_exif = (*dbrow[col] != '0'); col++; bool embed_exif = (*dbrow[col] != '0'); col++;
int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width); int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);