Commit Graph
16 Commits
Author SHA1 Message Date
Michael Hansen f84cce3238 Convert incoming novice images to ubyte 2014-03-26 08:48:10 -04:00
Michael Hansen dc798e27f1 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-26 08:47:48 -04:00
Michael Hansen f792b11a15 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-23 18:04:48 -04:00
Michael Hansen aa8cc0af40 Merged with ahojnnes novice 2014-03-19 20:58:44 -04:00
Michael Hansen 42417def67 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-19 20:46:33 -04:00
Michael Hansen c244951e90 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-17 08:52:17 -04:00
Michael Hansen 8321c84e63 Merged with master 2014-03-17 08:40:58 -04:00
Michael Hansen 1312670d56 Merged with upstream 2013-11-20 14:01:42 -05:00
Michael Hansen 695da41841 Removed extraneous trys for six imports 2013-11-20 14:00:46 -05:00
Michael Hansen f11ef60c35 Fixed import of urlparse and rebase on upstream 2013-10-29 09:43:52 -04:00
Michael Hansen 7d4544f203 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2013-10-29 09:43:22 -04:00
Michael Hansen 522778b214 Trying to get imports working with both Python 2 and 3 2013-10-28 10:29:20 -04:00
Michael Hansen 1d6531aa04 Fixed Python 3 import errors, added alpha and rgba properties 2013-10-23 16:28:41 -04:00
Michael Hansen 9d91751ed9 Switching to RGBA 2013-10-23 15:44:50 -04:00
Michael Hansen f5c68531ab Novice module can open images from a url 2013-10-22 13:07:16 -04:00
Michael HansenandTony S Yu 2e98d8c21c Added novice submodule after rebase 2013-10-21 23:02:45 -05:00