Merge lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-SimpleCV into lp://staging/xpresser
Proposed by
Chris Wayne
Status: | Merged |
---|---|
Approved by: | Chris Wayne |
Approved revision: | 16 |
Merged at revision: | 11 |
Proposed branch: | lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-SimpleCV |
Merge into: | lp://staging/xpresser |
Diff against target: |
1797 lines (+1126/-160) 32 files modified
debian/changelog (+71/-0) debian/compat (+1/-0) debian/control (+12/-0) debian/files (+1/-0) debian/python-xpresser.debhelper.log (+46/-0) debian/python-xpresser.postinst.debhelper (+7/-0) debian/python-xpresser.prerm.debhelper (+12/-0) debian/python-xpresser.substvars (+4/-0) debian/python-xpresser/DEBIAN/control (+10/-0) debian/python-xpresser/DEBIAN/md5sums (+10/-0) debian/python-xpresser/DEBIAN/postinst (+9/-0) debian/python-xpresser/DEBIAN/prerm (+14/-0) debian/python-xpresser/usr/share/pyshared/Xpresser-1.0.egg-info (+10/-0) debian/python-xpresser/usr/share/pyshared/xpresser/__init__.py (+23/-0) debian/python-xpresser/usr/share/pyshared/xpresser/errors.py (+23/-0) debian/python-xpresser/usr/share/pyshared/xpresser/image.py (+76/-0) debian/python-xpresser/usr/share/pyshared/xpresser/imagedir.py (+111/-0) debian/python-xpresser/usr/share/pyshared/xpresser/imagematch.py (+54/-0) debian/python-xpresser/usr/share/pyshared/xpresser/opencvfinder.py (+142/-0) debian/python-xpresser/usr/share/pyshared/xpresser/xp.py (+128/-0) debian/python-xpresser/usr/share/pyshared/xpresser/xutils.py (+132/-0) debian/rules (+9/-0) example.py (+3/-4) test (+125/-11) xpresser/__init__.py (+0/-2) xpresser/image.py (+1/-1) xpresser/opencvfinder.py (+19/-51) xpresser/tests/test_opencvfinder.py (+12/-13) xpresser/tests/test_xp.py (+12/-7) xpresser/tests/test_xutils.py (+29/-40) xpresser/xp.py (+5/-5) xpresser/xutils.py (+15/-26) |
To merge this branch: | bzr merge lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-SimpleCV |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xpresser | Pending | ||
Review via email: mp+113582@code.staging.launchpad.net |
Description of the change
GTK3 port with SimpleCV instead of OpenCV. This makes xpresser work much better in Precise
To post a comment you must log in.