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

remove last_send_image_width/height. Not really useful or relevant

This commit is contained in:
Isaac Connor 2022-01-10 10:13:11 -05:00
parent ed7bc7c4b4
commit b406bf8fd1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_stream.cpp
View File

@ -157,7 +157,6 @@ Image *StreamBase::prepareImage(Image *image) {
int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE; int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE; int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag; int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
Debug(3, Debug(3,
"Scaling by %d, zooming by %d = magnifying by %d(%d)\n" "Scaling by %d, zooming by %d = magnifying by %d(%d)\n"
@ -169,8 +168,7 @@ Image *StreamBase::prepareImage(Image *image) {
"Last actual image width = %d, height = %d\n" "Last actual image width = %d, height = %d\n"
"Display image width = %d, height = %d\n" "Display image width = %d, height = %d\n"
"Last display image width = %d, height = %d\n" "Last display image width = %d, height = %d\n"
"Send image width = %d, height = %d\n" "Send image width = %d, height = %d\n",
"Last send image width = %d, height = %d\n",
scale, zoom, mag, act_mag, scale, zoom, mag, act_mag,
last_scale, last_zoom, last_mag, last_act_mag, last_scale, last_zoom, last_mag, last_act_mag,
base_image_width, base_image_height, base_image_width, base_image_height,
@ -180,8 +178,7 @@ Image *StreamBase::prepareImage(Image *image) {
last_act_image_width, last_act_image_height, last_act_image_width, last_act_image_height,
disp_image_width, disp_image_height, disp_image_width, disp_image_height,
last_disp_image_width, last_disp_image_height, last_disp_image_width, last_disp_image_height,
send_image_width, send_image_height, send_image_width, send_image_height
last_send_image_width, last_send_image_height
); );
if ( ( mag != ZM_SCALE_BASE ) && (act_mag != ZM_SCALE_BASE) ) { if ( ( mag != ZM_SCALE_BASE ) && (act_mag != ZM_SCALE_BASE) ) {