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

Don't rotate dimensions when constructing the monitor because they are already rotated

This commit is contained in:
Isaac Connor 2016-04-25 13:55:28 -04:00
parent 5a3978f9e8
commit 26a45d5fa9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_monitor.cpp
View File

@ -306,8 +306,12 @@ Monitor::Monitor(
server_id( p_server_id ), server_id( p_server_id ),
function( (Function)p_function ), function( (Function)p_function ),
enabled( p_enabled ), enabled( p_enabled ),
width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ), // When we instantiate the camera, the dimensions are rotated. So if we rotate them again here, we undo the rotation.
height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ), // With this change, calls to Monitor->Width and Height will give the rotated dimesions.So this will trickle down
width( p_camera->Width() ),
height( p_camera->Height() ),
//width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
//height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ),
orientation( (Orientation)p_orientation ), orientation( (Orientation)p_orientation ),
deinterlacing( p_deinterlacing ), deinterlacing( p_deinterlacing ),
label_coord( p_label_coord ), label_coord( p_label_coord ),