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

Fix rotation bug caused by commit 5a9364703c

This commit is contained in:
Kfir Itzhak 2013-10-10 06:55:45 +03:00
parent fcf969f575
commit 8cecadadc2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/zm_image.cpp
View File

@ -2352,10 +2352,10 @@ void Image::Rotate( int angle )
if ( colours == ZM_COLOUR_GRAY8 ) if ( colours == ZM_COLOUR_GRAY8 )
{ {
unsigned char *d_ptr; unsigned char *d_ptr;
for ( unsigned int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_ptr = rotate_buffer+i; d_ptr = rotate_buffer+(i-1);
for ( unsigned int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
*d_ptr = *s_ptr++; *d_ptr = *s_ptr++;
d_ptr += line_bytes; d_ptr += line_bytes;
@ -2366,10 +2366,10 @@ void Image::Rotate( int angle )
{ {
Rgb* s_rptr = (Rgb*)s_ptr; Rgb* s_rptr = (Rgb*)s_ptr;
Rgb* d_rptr; Rgb* d_rptr;
for ( unsigned int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_rptr = (Rgb*)(rotate_buffer+(i<<2)); d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
for ( unsigned int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
*d_rptr = *s_rptr++; *d_rptr = *s_rptr++;
d_rptr += new_width; d_rptr += new_width;
@ -2379,10 +2379,10 @@ void Image::Rotate( int angle )
else /* Assume RGB24 */ else /* Assume RGB24 */
{ {
unsigned char *d_ptr; unsigned char *d_ptr;
for ( unsigned int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_ptr = rotate_buffer+(3*i); d_ptr = rotate_buffer+((i-1)*3);
for ( unsigned int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
*d_ptr = *s_ptr++; *d_ptr = *s_ptr++;
*(d_ptr+1) = *s_ptr++; *(d_ptr+1) = *s_ptr++;
@ -2439,10 +2439,10 @@ void Image::Rotate( int angle )
if ( colours == ZM_COLOUR_GRAY8 ) if ( colours == ZM_COLOUR_GRAY8 )
{ {
unsigned char *d_ptr; unsigned char *d_ptr;
for ( unsigned int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_ptr = rotate_buffer+i; d_ptr = rotate_buffer+(i-1);
for ( unsigned int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
s_ptr--; s_ptr--;
*d_ptr = *s_ptr; *d_ptr = *s_ptr;
@ -2454,10 +2454,10 @@ void Image::Rotate( int angle )
{ {
Rgb* s_rptr = (Rgb*)s_ptr; Rgb* s_rptr = (Rgb*)s_ptr;
Rgb* d_rptr; Rgb* d_rptr;
for ( int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_rptr = (Rgb*)(rotate_buffer+(i<<2)); d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
for ( int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
s_rptr--; s_rptr--;
*d_rptr = *s_rptr; *d_rptr = *s_rptr;
@ -2468,10 +2468,10 @@ void Image::Rotate( int angle )
else /* Assume RGB24 */ else /* Assume RGB24 */
{ {
unsigned char *d_ptr; unsigned char *d_ptr;
for ( unsigned int i = new_width-1; i >= 0; i-- ) for ( unsigned int i = new_width; i > 0; i-- )
{ {
d_ptr = rotate_buffer+(3*i); d_ptr = rotate_buffer+((i-1)*3);
for ( unsigned int j = new_height-1; j >= 0; j-- ) for ( unsigned int j = new_height; j > 0; j-- )
{ {
*(d_ptr+2) = *(--s_ptr); *(d_ptr+2) = *(--s_ptr);
*(d_ptr+1) = *(--s_ptr); *(d_ptr+1) = *(--s_ptr);