ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix init when no GSOAP

This commit is contained in:
Isaac Connor 2022-01-08 12:37:23 -05:00
parent f01ecf2a16
commit a153798b47
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -419,12 +419,14 @@ Monitor::Monitor()
privacy_bitmask(nullptr), privacy_bitmask(nullptr),
n_linked_monitors(0), n_linked_monitors(0),
linked_monitors(nullptr), linked_monitors(nullptr),
#ifdef WITH_GSOAP
soap(nullptr),
#endif
red_val(0), red_val(0),
green_val(0), green_val(0),
blue_val(0), blue_val(0),
grayscale_val(0), grayscale_val(0),
colour_val(0), colour_val(0)
soap(nullptr)
{ {
if ( strcmp(config.event_close_mode, "time") == 0 ) if ( strcmp(config.event_close_mode, "time") == 0 )

17
src/zm_monitor.h
View File

@ -431,14 +431,6 @@ protected:
std::string diag_path_ref; std::string diag_path_ref;
std::string diag_path_delta; std::string diag_path_delta;
// Used in check signal
uint8_t red_val;
uint8_t green_val;
uint8_t blue_val;
uint8_t grayscale_val; /* 8bit grayscale color */
Rgb colour_val; /* RGB32 color */
int usedsubpixorder;
//ONVIF //ONVIF
#ifdef WITH_GSOAP #ifdef WITH_GSOAP
struct soap *soap; struct soap *soap;
@ -451,6 +443,15 @@ protected:
PullPointSubscriptionBindingProxy proxyEvent; PullPointSubscriptionBindingProxy proxyEvent;
void set_credentials(struct soap *soap); void set_credentials(struct soap *soap);
#endif #endif
// Used in check signal
uint8_t red_val;
uint8_t green_val;
uint8_t blue_val;
uint8_t grayscale_val; /* 8bit grayscale color */
Rgb colour_val; /* RGB32 color */
int usedsubpixorder;
public: public:
explicit Monitor(); explicit Monitor();