generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1440 from SpecLad:wcast-align

Browse Source
This commit is contained in:
Roman Donchenko 2013-09-12 13:56:23 +04:00 committed by OpenCV Buildbot
commit dee2a65978
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/core_c.h
View File

@ -1129,7 +1129,7 @@ CVAPI(void) cvSetRemove( CvSet* set_header, int index );
NULL is returned */ NULL is returned */
CV_INLINE CvSetElem* cvGetSetElem( const CvSet* set_header, int idx ) CV_INLINE CvSetElem* cvGetSetElem( const CvSet* set_header, int idx )
{ {
CvSetElem* elem = (CvSetElem*)cvGetSeqElem( (CvSeq*)set_header, idx ); CvSetElem* elem = (CvSetElem*)(void *)cvGetSeqElem( (CvSeq*)set_header, idx );
return elem && CV_IS_SET_ELEM( elem ) ? elem : 0; return elem && CV_IS_SET_ELEM( elem ) ? elem : 0;
} }

6
modules/core/include/opencv2/core/mat.hpp
View File

@ -2263,10 +2263,10 @@ template<typename _Tp> inline const _Tp& SparseMat::value(const Node* n) const
{ return *(const _Tp*)((const uchar*)n + hdr->valueOffset); } { return *(const _Tp*)((const uchar*)n + hdr->valueOffset); }
inline SparseMat::Node* SparseMat::node(size_t nidx) inline SparseMat::Node* SparseMat::node(size_t nidx)
{ return (Node*)&hdr->pool[nidx]; } { return (Node*)(void*)&hdr->pool[nidx]; }
inline const SparseMat::Node* SparseMat::node(size_t nidx) const inline const SparseMat::Node* SparseMat::node(size_t nidx) const
{ return (const Node*)&hdr->pool[nidx]; } { return (const Node*)(void*)&hdr->pool[nidx]; }
inline SparseMatIterator SparseMat::begin() inline SparseMatIterator SparseMat::begin()
{ return SparseMatIterator(this); } { return SparseMatIterator(this); }
@ -2327,7 +2327,7 @@ template<typename _Tp> inline const _Tp& SparseMatConstIterator::value() const
inline const SparseMat::Node* SparseMatConstIterator::node() const inline const SparseMat::Node* SparseMatConstIterator::node() const
{ {
return ptr && m && m->hdr ? return ptr && m && m->hdr ?
(const SparseMat::Node*)(ptr - m->hdr->valueOffset) : 0; (const SparseMat::Node*)(void*)(ptr - m->hdr->valueOffset) : 0;
} }
inline SparseMatConstIterator SparseMatConstIterator::operator ++(int) inline SparseMatConstIterator SparseMatConstIterator::operator ++(int)

4
modules/core/include/opencv2/core/operations.hpp
View File

@ -3147,10 +3147,10 @@ inline FileNodeIterator FileNode::end() const
} }
inline FileNode FileNodeIterator::operator *() const inline FileNode FileNodeIterator::operator *() const
{ return FileNode(fs, (const CvFileNode*)reader.ptr); } { return FileNode(fs, (const CvFileNode*)(void*)reader.ptr); }
inline FileNode FileNodeIterator::operator ->() const inline FileNode FileNodeIterator::operator ->() const
{ return FileNode(fs, (const CvFileNode*)reader.ptr); } { return FileNode(fs, (const CvFileNode*)(void*)reader.ptr); }
template<typename _Tp> static inline FileNodeIterator& operator >> (FileNodeIterator& it, _Tp& value) template<typename _Tp> static inline FileNodeIterator& operator >> (FileNodeIterator& it, _Tp& value)
{ read( *it, value, _Tp()); return ++it; } { read( *it, value, _Tp()); return ++it; }

8
modules/core/include/opencv2/core/types_c.h
View File

@ -766,11 +766,11 @@ CV_INLINE double cvmGet( const CvMat* mat, int row, int col )
(unsigned)col < (unsigned)mat->cols ); (unsigned)col < (unsigned)mat->cols );
if( type == CV_32FC1 ) if( type == CV_32FC1 )
return ((float*)(mat->data.ptr + (size_t)mat->step*row))[col]; return ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
else else
{ {
assert( type == CV_64FC1 ); assert( type == CV_64FC1 );
return ((double*)(mat->data.ptr + (size_t)mat->step*row))[col]; return ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
} }
} }
@ -783,11 +783,11 @@ CV_INLINE void cvmSet( CvMat* mat, int row, int col, double value )
(unsigned)col < (unsigned)mat->cols ); (unsigned)col < (unsigned)mat->cols );
if( type == CV_32FC1 ) if( type == CV_32FC1 )
((float*)(mat->data.ptr + (size_t)mat->step*row))[col] = (float)value; ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = (float)value;
else else
{ {
assert( type == CV_64FC1 ); assert( type == CV_64FC1 );
((double*)(mat->data.ptr + (size_t)mat->step*row))[col] = (double)value; ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = (double)value;
} }
} }

2
modules/flann/include/opencv2/flann/lsh_table.h
View File

@ -386,7 +386,7 @@ inline size_t LshTable<unsigned char>::getKey(const unsigned char* feature) cons
{ {
// no need to check if T is dividable by sizeof(size_t) like in the Hamming // no need to check if T is dividable by sizeof(size_t) like in the Hamming
// distance computation as we have a mask // distance computation as we have a mask
const size_t* feature_block_ptr = reinterpret_cast<const size_t*> (feature); const size_t* feature_block_ptr = reinterpret_cast<const size_t*> ((const void*)feature);
// Figure out the subsignature of the feature // Figure out the subsignature of the feature
// Given the feature ABCDEF, and the mask 001011, the output will be // Given the feature ABCDEF, and the mask 001011, the output will be