author | sandman <sandman> | 2002-12-11 18:35:16 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-11 18:35:16 (UTC) |
commit | 8ca42b97de03ac84da04b9be84f9bbb8eb17b52d (patch) (side-by-side diff) | |
tree | 07e9ed49638eadda2dc475aa965562d199932826 | |
parent | b8db7cfea977d20f2d491b0a208a237efb15019a (diff) | |
download | opie-8ca42b97de03ac84da04b9be84f9bbb8eb17b52d.zip opie-8ca42b97de03ac84da04b9be84f9bbb8eb17b52d.tar.gz opie-8ca42b97de03ac84da04b9be84f9bbb8eb17b52d.tar.bz2 |
valgrind complained and here are some off-by-1 fixes
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 791818e..0833784 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -48,15 +48,16 @@ // 0 deg rot: copy a line from src to dst (use libc memcpy) // 180 deg rot: copy a line from src to dst reversed static inline void memcpy_rev ( void *dst, void *src, size_t len ) { - ((char *) src ) += len; - len >>= 1; + + ((char *) src ) += ( len << 1 ); + while ( len-- ) *((short int *) dst )++ = *--((short int *) src ); } // 90 deg rot: copy a column from src to dst @@ -189,13 +190,13 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) memset ( dst, 0, leftfill ); // "left" border -> black if ( framefill ) { // blit in the video frame // see above for an explanation of the different memcpys switch ( rot ) { - case 0: memcpy ( dst + leftfill, src, framefill ); break; + case 0: memcpy ( dst + leftfill, src, framefill & ~1 ); break; case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; default: break; } } |