Commit Graph

859 Commits

Author SHA1 Message Date
Neil Yager 3ddfdbdb9c Updates based on review comments 2011-10-17 08:32:19 +01:00
Neil Yager fb81057774 Added a new unit test 2011-10-14 12:53:06 +01:00
Neil Yager 3d2613cdfa Added unit tests to skeletonization 2011-10-13 14:35:37 +01:00
Neil Yager 8ad8946900 Added more objects to skeletonize demo 2011-10-13 09:51:27 +01:00
Neil Yager c120708feb Merge remote-tracking branch 'upstream/master' into neil_yager-skeletonize
* upstream/master:
  Remove print statements
  Remove print statements
  Update URL in package description
  Fix print statements missed by 2to3
  Fix: don't run all scikits tests when running scikits.image.test()
  DOC: Rewash the git docs.
  DOC: Use correct repo URL in gitwash.
  DOC: Add gitwash as a submodule.
  Remove empty gitwash directory in order to fix submodule.
  DOC: Update contributors.
  BUG: Fix scikits.image.test.
2011-10-13 08:29:58 +01:00
Neil Yager 74bde135c9 Added skeleonize example 2011-10-13 08:29:32 +01:00
Stefan van der Walt 8c16be159b Merge pull request #58 from cgohlke/patch-3
PKG: Update URL in package description.
2011-10-12 15:46:01 -07:00
Stefan van der Walt 57745f5e84 Merge pull request #59 from cgohlke/patch-2
Remove print statements from tests
2011-10-12 15:42:19 -07:00
cgohlke 8024cc9798 Remove print statements 2011-10-12 15:29:56 -07:00
cgohlke cc84603b1a Remove print statements 2011-10-12 15:25:41 -07:00
cgohlke b708d931c2 Update URL in package description 2011-10-12 15:01:31 -07:00
Stefan van der Walt 0c54aee1f8 Merge pull request #56 from cgohlke/patch-1
Fix: don't run all scikits tests when running scikits.image.test()
2011-10-12 14:15:28 -07:00
cgohlke a609bd6416 Fix print statements missed by 2to3 2011-10-12 14:09:29 -07:00
cgohlke 98290218f0 Fix: don't run all scikits tests when running scikits.image.test() 2011-10-12 14:06:09 -07:00
Stefan van der Walt b381d59c67 DOC: Rewash the git docs. 2011-10-12 13:45:56 -07:00
Stefan van der Walt 69a10b62c3 DOC: Use correct repo URL in gitwash. 2011-10-12 13:44:59 -07:00
Stefan van der Walt 603216e4a7 DOC: Add gitwash as a submodule. 2011-10-12 13:41:17 -07:00
Stefan van der Walt 05f780b887 Remove empty gitwash directory in order to fix submodule. 2011-10-12 13:39:18 -07:00
Stefan van der Walt 771c905227 DOC: Update contributors. 2011-10-12 13:24:35 -07:00
Stefan van der Walt 8ba2518333 BUG: Fix scikits.image.test. 2011-10-12 13:04:53 -07:00
Neil Yager 772c469ec1 Initial revision of skeletonization 2011-10-12 13:38:36 +01:00
Stefan van der Walt 677c768bb1 Remove OpenCV wrappers for 0.4 release. 2011-10-11 19:38:15 -07:00
Stefan van der Walt 38e50ba498 Merge npy -> npz transition. 2011-10-11 19:34:44 -07:00
Stefan van der Walt 8a06fb79cf Fix another instance of an .npy file. 2011-10-11 19:21:06 -07:00
Stefan van der Walt 1aa7af64a9 Merge npz fixes from Christoph Gohlke. 2011-10-11 19:03:35 -07:00
Stefan van der Walt c60d490a99 Use .npz test data in opencv tests. 2011-10-11 19:03:27 -07:00
Stefan van der Walt ece0363264 Replace .npy files by .npz. Smaller, and avoids pickling problems on Python 3. 2011-10-11 19:03:08 -07:00
Stefan van der Walt 1f101ceb6f Merge pull request #53 from cgohlke/patch-1
Fix ImportError on Python 3
2011-10-11 18:36:27 -07:00
cgohlke b15e7df14b Fix: use npz instead of npy format for matlab-output files 2011-10-11 17:23:30 -07:00
cgohlke 02b31756ff Fix: use npz instead of npy format for matlab-output files 2011-10-11 17:19:53 -07:00
cgohlke fb66138f9e Fix ImportError on Python 3 2011-10-11 17:12:06 -07:00
Stefan van der Walt f332b177fb Merge pull request #51 from cgohlke/patch-8
Fix watershed failures on Python 3
2011-10-10 18:41:27 -07:00
Stefan van der Walt fb4c61797c Merge pull request #52 from cgohlke/patch-15
Fix Python 3 import errors
2011-10-10 18:41:01 -07:00
cgohlke 7c586cfeff Edited scikits/image/morphology/__init__.py via GitHub 2011-10-10 16:10:39 -07:00
cgohlke 17ff626bf6 Edited scikits/image/draw/draw.py via GitHub 2011-10-10 16:09:43 -07:00
cgohlke 09e0ecdf96 Edited scikits/image/morphology/watershed.py via GitHub 2011-10-10 16:09:12 -07:00
cgohlke 58226e3fca Fix Python 3 import error 2011-10-10 16:08:13 -07:00
cgohlke be02b9a651 Fix Python 3 import error 2011-10-10 16:07:24 -07:00
cgohlke b57bd821f0 Fix Python 3 import error 2011-10-10 16:06:03 -07:00
cgohlke 7f07f825e8 Fix watershed failures on Python 3 2011-10-10 14:35:21 -07:00
Stefan van der Walt 0fe16b54ac Merge pull request #50 from cgohlke/patch-7
Fix `AttributeError: 'function' object has no attribute 'func_name'`
2011-10-10 14:12:10 -07:00
Stefan van der Walt 1a0aa1c792 Merge pull request #49 from cgohlke/patch-6
Work around `AttributeError: 'module' object has no attribute 'BufferedIO
2011-10-10 14:11:30 -07:00
cgohlke d6a55c8b7b Fix AttributeError: 'function' object has no attribute 'func_name' on Python 3 2011-10-10 14:01:19 -07:00
cgohlke 5d6fcf06c4 Work around AttributeError: 'module' object has no attribute 'BufferedIOBase' on Python 2.7+, Windows 2011-10-10 13:52:55 -07:00
Stefan van der Walt 4336361c34 Merge pull request #47 from cgohlke/patch-4
Fix ValueError in _hough_transform on win-amd64
2011-10-10 13:23:56 -07:00
Stefan van der Walt f92ace7ec7 Merge pull request #48 from cgohlke/patch-5
BUG: `TypeError: must use keyword argument for key function` on Python 3.
2011-10-10 13:23:22 -07:00
cgohlke f83076f722 Fix TypeError: must use keyword argument for key function on Python 3 2011-10-10 13:19:46 -07:00
cgohlke 9a24de9b81 Fix ValueError on win-amd64 2011-10-10 13:07:50 -07:00
Stefan van der Walt d22da55cdc BUG: Untabify video.py. 2011-10-10 13:01:23 -07:00
Stefan van der Walt c89fd43759 PKG: Add python 3 and operating system tags to setup.py. 2011-10-10 13:01:23 -07:00