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

Merge branch 'master' into replace_function_concept

This commit is contained in:
Isaac Connor 2022-02-14 12:03:25 -05:00
parent 485cc26065 b6d2d96d11
commit c8a2b6d679
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zm_image.cpp
View File

@ -84,8 +84,11 @@ static ZmFont font;
std::mutex jpeg_mutex; std::mutex jpeg_mutex;
void Image::update_function_pointers() { void Image::update_function_pointers() {
/* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */ /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements
if ( pixels % 16 || pixels % 12 ) { * previous tests were %16 or %12 but that is incorrect. Should just be %4
*/
if (pixels %4) {
// have to use non-loop unrolled functions // have to use non-loop unrolled functions
delta8_rgb = &std_delta8_rgb; delta8_rgb = &std_delta8_rgb;
delta8_bgr = &std_delta8_bgr; delta8_bgr = &std_delta8_bgr;
@ -95,7 +98,7 @@ void Image::update_function_pointers() {
delta8_abgr = &std_delta8_abgr; delta8_abgr = &std_delta8_abgr;
delta8_gray8 = &std_delta8_gray8; delta8_gray8 = &std_delta8_gray8;
blend = &std_blend; blend = &std_blend;
Warning("Using slow std functions"); Warning("Using slow std functions because pixels %d mod 4=%d", pixels, pixels%4);
} else { } else {
// Use either sse or neon, or loop unrolled version // Use either sse or neon, or loop unrolled version
delta8_rgb = fptr_delta8_rgb; delta8_rgb = fptr_delta8_rgb;

7
web/skins/classic/views/frame.php
View File

@ -115,10 +115,11 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
<div> <div>
<p id="image"> <p id="image">
<?php <?php
if ( $imageData['hasAnalImage'] ) { if ($imageData['hasAnalImage']) {
echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">', echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">',
$Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ), $Event->Id(), $Frame->FrameId(), $scale,
( $show=='anal'?'without':'with' ), ($show=='anal'?'capt':'anal'),
($show=='anal'?'without':'with')
); );
} }
?> ?>