fixed cvReshapeMatND + the sample in documentation (ticket #166)

git-svn-id: https://code.ros.org/svn/opencv/trunk@2820 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/doc/cxcore_array_operations.tex b/opencv/doc/cxcore_array_operations.tex
index 5eefa37aef9608191255c63dc05b26dcb54d2625..a5dd291a1439eeb9759f06afeeadd45299ee7e80 100644 (file)
--- a/opencv/doc/cxcore_array_operations.tex
+++ b/opencv/doc/cxcore_array_operations.tex
@@ -2691,7 +2691,7 @@ gray_img = (IplImage*)cvReshapeND(color_img, &gray_img_hdr, 1, 0, 0);
 int size[] = { 2, 2, 2 };
 CvMatND* mat = cvCreateMatND(3, size, CV_32F);
 CvMat row_header, *row;
-row = cvReshapeND(mat, &row_header, 0, 1, 0);
+row = (CvMat*)cvReshapeND(mat, &row_header, 0, 1, 0);
 
 \end{lstlisting}
 \fi

diff --git a/opencv/src/cxcore/cxarray.cpp b/opencv/src/cxcore/cxarray.cpp
index e67ef7f0f065c8e232bdd6fb832143c2cdbc8159..fe660a1f9a6d78464e03e2a74b60ac06f794cb1b 100644 (file)
--- a/opencv/src/cxcore/cxarray.cpp
+++ b/opencv/src/cxcore/cxarray.cpp
@@ -2665,7 +2665,7 @@ cvReshapeMatND( const CvArr* arr,
         }
     }
 
-    if( !coi )
+    if( coi )
         CV_Error( CV_BadCOI, "COI is not supported by this operation" );
 
     result = _header;