From abda4411e94be1caca88b8840452e8a8db2030f2 Mon Sep 17 00:00:00 2001 From: SteveGilvarry Date: Wed, 23 Dec 2015 19:34:31 +1100 Subject: [PATCH 1/3] Revert to Default Theme, RTD will use their own and local builds default sphinx theme --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 109161b24..9bda5df7b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -101,8 +101,8 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -#html_theme = 'default' -html_theme = 'sphinx_rtd_theme' +html_theme = 'default' +#html_theme = 'sphinx_rtd_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 From 3f1c782ff755642f4e83f20ee7e7987af0b9111b Mon Sep 17 00:00:00 2001 From: SteveGilvarry Date: Mon, 28 Dec 2015 16:29:04 +1100 Subject: [PATCH 2/3] Fix random extra semicolon --- src/zm_monitor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index f07713cd8..657eb2e75 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2049,7 +2049,6 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors ) int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose ) { std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'"; -; if ( device[0] ) { sql += " AND Device='"; sql += device; From ccded54937f27761e7c49ddb88fd0f7c4d0b1c8e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 28 Dec 2015 11:52:40 -0500 Subject: [PATCH 3/3] put back missing col++ --- src/zm_monitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index f07713cd8..e12a8da67 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2787,6 +2787,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame ); signal_check_colour = strtol(dbrow[col]+1,0,16); else signal_check_colour = strtol(dbrow[col],0,16); + col++; bool embed_exif = (*dbrow[col] != '0'); col++; int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);