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

Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation

This commit is contained in:
Kfir Itzhak 2013-11-01 13:31:37 +02:00
parent 8cecadadc2
commit 069552321f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_image.h
View File

@ -187,11 +187,12 @@ public:
inline void CopyBuffer( const Image &image ) inline void CopyBuffer( const Image &image )
{ {
if ( image.size != size ) Assign(image);
{ }
Panic( "Attempt to copy different size image buffers, expected %d, got %d", size, image.size ); inline Image &operator=( const Image &image )
} {
(*fptr_imgbufcpy)(buffer, image.buffer, size); Assign(image);
return *this;
} }
inline Image &operator=( const unsigned char *new_buffer ) inline Image &operator=( const unsigned char *new_buffer )
{ {