Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.

2012-02-16 20:29:35 +00:00
parent 2219e38192
commit 691d392312
12 changed files with 149 additions and 143 deletions
--- a/modules/legacy/src/contourtree.cpp
+++ b/modules/legacy/src/contourtree.cpp
@@ -586,7 +586,7 @@ icvCreateContourTree( const CvSeq * contour, CvMemStorage * storage,
 /*    CV_WRITE_SEQ_ELEM (tree_one, start_writer);   */
    i_tree++;
 /*  create Sequence hearder     */
-    *((CvSeq **) tree) = cvEndWriteSeq( &writer );
+    *tree = (CvContourTree*)cvEndWriteSeq( &writer );
 /*   write points for the main segment into sequence header   */
    (*tree)->p1 = pt1[0];