ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed memcpy to memove where overlaps might occur. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2762 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2009-02-16 18:17:19 +00:00
parent 2f9524d00e
commit bfc329b96a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_image.cpp
View File

@ -1386,7 +1386,8 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
active_edges[n_active_edges++] = global_edges[i];
if ( i < (n_global_edges-1) )
{
memcpy( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
//memcpy( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
memmove( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
i--;
}
n_global_edges--;
@ -1441,7 +1442,8 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
Debug( 9, "Deleting active_edge" );
if ( i < (n_active_edges-1) )
{
memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
//memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
memmove( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
}
n_active_edges--;
}