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

add support to render gif image that may be created by object detection

This commit is contained in:
Pliable Pixels 2020-03-09 15:56:34 -04:00
parent a261efe0a7
commit 6bc8012e04
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/views/image.php
View File

@ -57,6 +57,7 @@ $filename = '';
$Frame = null;
$Event = null;
$path = null;
$image_type='image/jpeg';
if ( empty($_REQUEST['path']) ) {
@ -76,7 +77,16 @@ if ( empty($_REQUEST['path']) ) {
return;
}
if ( $_REQUEST['fid'] == 'objdetect' ) {
if ( $_REQUEST['fid'] == 'objdetectgif' ) {
$path = $Event->Path().'/objdetect.gif';
if ( !file_exists($path) ) {
header('HTTP/1.0 404 Not Found');
ZM\Fatal("File $path does not exist. Please make sure store_frame_in_zm is enabled in the object detection config");
}
$Frame = new ZM\Frame();
$Frame->Id('objdetect');
$image_type = 'image/gif';
} else if ( $_REQUEST['fid'] == 'objdetect' ) {
$path = $Event->Path().'/objdetect.jpg';
if ( !file_exists($path) ) {
header('HTTP/1.0 404 Not Found');
@ -281,7 +291,7 @@ if ( !empty($_REQUEST['height']) ) {
if ( $errorText ) {
ZM\Error($errorText);
} else {
header('Content-type: image/jpeg');
header("Content-type: $image_type");
if ( ( $scale==0 || $scale==100 ) && ($width==0) && ($height==0) ) {
# This is so that Save Image As give a useful filename
if ( $Event ) {