summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-18 16:43:47 (UTC)
committer zecke <zecke>2004-09-18 16:43:47 (UTC)
commitc81e90d0f6c0feec1443d711833ea382a1c10ec6 (patch) (unidiff)
tree7390346761cfbceee0abccb51a80e30898f54f3b
parentfa5c8471c3053dfc8d9742426faa569b3aa03d71 (diff)
downloadopie-c81e90d0f6c0feec1443d711833ea382a1c10ec6.zip
opie-c81e90d0f6c0feec1443d711833ea382a1c10ec6.tar.gz
opie-c81e90d0f6c0feec1443d711833ea382a1c10ec6.tar.bz2
A proposal for making the memory copy functions build with g++3.4.2.
Please review the patch, specially the casts it makes, and also the boundaries and sizes. -Shouldn't we use unsigned char* instead of char*. For arm it is already unsigned? -Check again the casts
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp66
1 files changed, 47 insertions, 19 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index b55750a..15c611f 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -43,45 +43,73 @@
43 43
44 44
45// 0 deg rot: copy a line from src to dst (use libc memcpy) 45// 0 deg rot: copy a line from src to dst (use libc memcpy)
46 46
47// 180 deg rot: copy a line from src to dst reversed 47// 180 deg rot: copy a line from src to dst reversed
48 48
49static inline void memcpy_rev ( void *dst, void *src, size_t len ) 49/*
50 * This code relies the len be a multiply of 16bit
51 */
52static inline void memcpy_rev ( void *_dst, void *_src, size_t len )
50{ 53{
51 len >>= 1; 54 /*
52 55 * move the source to the end
53 ((char *) src ) += ( len << 1 ); 56 */
57 char *src_c = static_cast<char*>(_src) + len;
58
59 /*
60 * as we copy by 16bit and not 8bit
61 * devide the length by two
62 */
63 len >>= 1;
64
65 short int* dst = static_cast<short int*>( _dst );
66 short int* src = reinterpret_cast<short int*>( src_c );
67
68 /*
69 * Increment dst after assigning
70 * Decrement src before assigning becase we move backwards
71 */
72 while ( len-- )
73 *dst++ = *--src;
54 74
55 while ( len-- )
56 *((short int *) dst )++ = *--((short int *) src );
57} 75}
58 76
59// 90 deg rot: copy a column from src to dst 77// 90 deg rot: copy a column from src to dst
60 78
61static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) 79static inline void memcpy_step ( void *_dst, void *_src, size_t len, size_t step )
62{ 80{
63 len >>= 1; 81 short int *dst = static_cast<short int*>( _dst );
64 while ( len-- ) { 82 short int *src = static_cast<short int*>( _src );
65 *((short int *) dst )++ = *((short int *) src ); 83
66 ((char *) src ) += step; 84 len >>= 1;
67 } 85
86 /*
87 * Copy 16bit from src to dst and move to the next address
88 */
89 while ( len-- ) {
90 *dst++ = *src;
91 src = reinterpret_cast<short int*>(reinterpret_cast<char*>(src)+step);
92 }
68} 93}
69 94
70// 270 deg rot: copy a column from src to dst reversed 95// 270 deg rot: copy a column from src to dst reversed
71 96
72static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) 97static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t step )
73{ 98{
74 len >>= 1; 99 len >>= 1;
75 100
76 ((char *) src ) += ( len * step ); 101 char *src_c = static_cast<char*>( _src ) + (len*step);
102 short int* dst = static_cast<short int*>( _dst );
103 short int* src = reinterpret_cast<short int*>( src_c );
77 104
78 while ( len-- ) { 105 while ( len-- ) {
79 ((char *) src ) -= step; 106 src_c -= step;
80 *((short int *) dst )++ = *((short int *) src ); 107 src = reinterpret_cast<short int*>( src_c );
81 } 108 *dst++ = *src;
109 }
82} 110}
83 111
84 112
85XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) 113XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name )
86 : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ) 114 : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
87{ 115{