summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-18 16:43:47 (UTC)
committer zecke <zecke>2004-09-18 16:43:47 (UTC)
commitc81e90d0f6c0feec1443d711833ea382a1c10ec6 (patch) (side-by-side diff)
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) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp48
1 files changed, 38 insertions, 10 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
@@ -47,22 +47,47 @@
// 180 deg rot: copy a line from src to dst reversed
-static inline void memcpy_rev ( void *dst, void *src, size_t len )
+/*
+ * This code relies the len be a multiply of 16bit
+ */
+static inline void memcpy_rev ( void *_dst, void *_src, size_t len )
{
+ /*
+ * move the source to the end
+ */
+ char *src_c = static_cast<char*>(_src) + len;
+
+ /*
+ * as we copy by 16bit and not 8bit
+ * devide the length by two
+ */
len >>= 1;
- ((char *) src ) += ( len << 1 );
+ short int* dst = static_cast<short int*>( _dst );
+ short int* src = reinterpret_cast<short int*>( src_c );
+ /*
+ * Increment dst after assigning
+ * Decrement src before assigning becase we move backwards
+ */
while ( len-- )
- *((short int *) dst )++ = *--((short int *) src );
+ *dst++ = *--src;
+
}
// 90 deg rot: copy a column from src to dst
-static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
+static inline void memcpy_step ( void *_dst, void *_src, size_t len, size_t step )
{
+ short int *dst = static_cast<short int*>( _dst );
+ short int *src = static_cast<short int*>( _src );
+
len >>= 1;
+
+ /*
+ * Copy 16bit from src to dst and move to the next address
+ */
while ( len-- ) {
- *((short int *) dst )++ = *((short int *) src );
- ((char *) src ) += step;
+ *dst++ = *src;
+ src = reinterpret_cast<short int*>(reinterpret_cast<char*>(src)+step);
}
}
@@ -70,13 +95,16 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
// 270 deg rot: copy a column from src to dst reversed
-static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step )
+static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t step )
{
len >>= 1;
- ((char *) src ) += ( len * step );
+ char *src_c = static_cast<char*>( _src ) + (len*step);
+ short int* dst = static_cast<short int*>( _dst );
+ short int* src = reinterpret_cast<short int*>( src_c );
while ( len-- ) {
- ((char *) src ) -= step;
- *((short int *) dst )++ = *((short int *) src );
+ src_c -= step;
+ src = reinterpret_cast<short int*>( src_c );
+ *dst++ = *src;
}
}