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

whitespace google code style

This commit is contained in:
Isaac Connor 2018-03-27 11:04:40 -04:00
parent 3a5ff289d0
commit b8a792cfb7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/zm_monitor.cpp
View File

@ -1186,14 +1186,14 @@ bool Monitor::CheckSignal( const Image *image ) {
break; break;
} }
if(colours == ZM_COLOUR_GRAY8) { if ( colours == ZM_COLOUR_GRAY8 ) {
if ( *(buffer+index) != grayscale_val ) if ( *(buffer+index) != grayscale_val )
return true; return true;
} else if(colours == ZM_COLOUR_RGB24) { } else if ( colours == ZM_COLOUR_RGB24 ) {
const uint8_t *ptr = buffer+(index*colours); const uint8_t *ptr = buffer+(index*colours);
if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) { if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR ) {
if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) ) if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
return true; return true;
} else { } else {
@ -1202,8 +1202,8 @@ bool Monitor::CheckSignal( const Image *image ) {
return true; return true;
} }
} else if(colours == ZM_COLOUR_RGB32) { } else if ( colours == ZM_COLOUR_RGB32 ) {
if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) { if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR ) {
if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) ) if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
return true; return true;
} else { } else {
@ -1212,10 +1212,10 @@ bool Monitor::CheckSignal( const Image *image ) {
return true; return true;
} }
} }
} } // end for < signal_check_points
return( false ); return false;
} } // end if signal_check_points
return( true ); return true;
} }
bool Monitor::Analyse() { bool Monitor::Analyse() {