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

Move declaration of zones down to where it is used

pull/3826/head
Isaac Connor 2024-01-30 09:46:32 -05:00
parent f92115b4fe
commit 4993a55b14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_zone.cpp
View File

@ -826,8 +826,6 @@ bool Zone::ParseZoneString(const char *zone_string, unsigned int &zone_id, int &
} // end bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon) } // end bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon)
std::vector<Zone> Zone::Load(const std::shared_ptr<Monitor> &monitor) { std::vector<Zone> Zone::Load(const std::shared_ptr<Monitor> &monitor) {
std::vector<Zone> zones;
std::string sql = stringtf("SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0," std::string sql = stringtf("SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,"
"MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels," "MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,"
"FilterX,FilterY,MinFilterPixels,MaxFilterPixels," "FilterX,FilterY,MinFilterPixels,MaxFilterPixels,"
@ -843,7 +841,9 @@ std::vector<Zone> Zone::Load(const std::shared_ptr<Monitor> &monitor) {
uint32 n_zones = mysql_num_rows(result); uint32 n_zones = mysql_num_rows(result);
Debug(1, "Got %d zones for monitor %s", n_zones, monitor->Name()); Debug(1, "Got %d zones for monitor %s", n_zones, monitor->Name());
std::vector<Zone> zones;
zones.reserve(n_zones); zones.reserve(n_zones);
for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) { for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) {
int col = 0; int col = 0;