merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
@@ -117,7 +117,10 @@ public class puzzle15View extends SampleCvViewBase implements OnTouchListener {
        capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
        int cols = mRgba.cols();
        int rows = mRgba.rows();
-
+
+        rows = rows - rows%4;
+        cols = cols - cols%4;
+
        if (mCells == null)
            createPuzzle(cols, rows);