Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00
parent bd0e0b5800
commit f666bd221f
47 changed files with 457 additions and 436 deletions
--- a/samples/python2/common.py
+++ b/samples/python2/common.py
@@ -190,3 +190,7 @@ def mosaic(w, imgs):
    imgs = it.chain([img0], imgs)
    rows = grouper(w, imgs, pad)
    return np.vstack(map(np.hstack, rows))
+
+def getsize(img):
+    h, w = img.shape[:2]
+    return w, h