Commit Graph
31 Commits
Author SHA1 Message Date
Josh Warner 1213a3ea1a Merge pull request #1289 from ahojnnes/random
STY: Misc PEP8 fixes
2014-12-13 23:25:37 -06:00
Josh Warner 8a01994186 Merge pull request #1258 from blink1073/add-install-requires
FIX: Restore six to install_requires
2014-12-04 21:20:26 -06:00
Josh Warner b81cebc71d Merge pull request #1256 from matejak/contributors
DOC: Credit for 3d labeling in CONTRIBUTORS.txt
2014-12-04 14:23:11 -06:00
Josh Warner 22c9969274 Merge pull request #1221 from stefanv/pr_1126_update
ENH: Replace lena with astronaut
2014-11-08 00:45:08 -06:00
Josh Warner 45b3826137 Merge pull request #1213 from blink1073/fix-windows-install
Use Recommended "extern" Import Method for Cython
2014-10-30 23:07:49 -05:00
Josh Warner cc942364cd Merge pull request #1112 from pelson/docs_tidy
DOC: Minor documentation enhancements.
2014-08-31 11:34:41 +01:00
Josh Warner 9e8875790f Merge pull request #1069 from jni/nx-depends
Document NetworkX dependency in DEPENDS.txt
2014-07-15 11:19:16 -05:00
Josh Warner 3814df2f79 Merge pull request #1019 from stefanv/build/extra_files
Update MANIFEST to include all test data
2014-06-02 09:13:52 -05:00
Josh Warner 79e22aef74 Merge pull request #991 from stefanv/apigen_origin_license
Fix broken link to origin apigen source
2014-04-29 18:07:25 -05:00
Josh Warner efcd8153b5 Merge pull request #926 from sivapvarma/plt-subplots-examples
DOC: Use standard plt.subplots motif in examples
2014-03-27 00:40:16 -05:00
Josh Warner f4b260cb33 Merge pull request #907 from cgohlke/patch-1
Fix ValueError: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'lo...
2014-03-10 23:15:55 -05:00
Josh Warner faa4f571d4 Merge pull request #847 from ahojnnes/template
Fix bugs in array padding and template matching
2014-01-13 19:13:55 -08:00
Josh Warner 783e120e75 Merge pull request #788 from ahojnnes/patch-1
Weighted central moments
2013-10-15 10:45:50 -07:00
Josh Warner 714afb44f7 Merge pull request #787 from cgohlke/patch-2
TST: Fix RuntimeError: data type not supported on Python 2.6
2013-10-15 09:54:06 -07:00
Josh Warner 9bdfc81d80 Merge pull request #789 from ahojnnes/binary
Fix dtype error on 32bit systems as convolve is only implemented for 32b...
2013-10-15 09:53:31 -07:00
Josh Warner 5c73432101 Merge pull request #770 from cgohlke/patch-3
BUG: Fix ValueError: Buffer dtype mismatch, expected 'long' but got...
2013-10-11 00:13:53 -07:00
Josh Warner 673439f207 Merge pull request #692 from angelatlarge/fix_hog_orient_bins_rounding
FIX: Use float constant to avoid py2.x rounding errors
2013-08-15 13:51:26 -07:00
Josh Warner 35a33a9286 Merge pull request #682 from jni/slic-type-hotfix
FIX: Use Py_ssize_t instead of int in _slic_cython
2013-08-09 19:31:05 -07:00
Josh Warner a3bb1098d1 Merge pull request #632 from ahojnnes/local-blocks
Refactor N-dimensial array resampling and add additional functionality
2013-07-31 14:10:18 -07:00
Josh Warner b5d09bcd1c Merge pull request #603 from TheChymera/master
ENH: User-specified output aspect ratio in skimage.util.montage.montage2d function
2013-07-20 22:33:32 -07:00
Josh Warner 0295d54235 Merge pull request #656 from josteinbf/doc-makefile
ENH: Increase configurability of doc/Makefile
2013-07-15 06:58:30 -07:00
Josh Warner 6edd707a1b Merge pull request #637 from sciunto/minorfix
STYLE : PEP8 + import fix in hough_transform tests
2013-07-06 11:06:48 -07:00
Josh Warner bf26ce7fae Merge pull request #640 from sciunto/missingdoc
DOCFIX: add docstrings to Cython grayscale dilate/erode & make them private funcs
2013-07-06 07:16:09 -07:00
Josh Warner e5e0c73755 Merge pull request #634 from josteinbf/arraypad-zeros
arraypad: allow padding with zero entries (i.e. no padding).
2013-07-05 07:33:10 -07:00
Josh Warner 173fec01c7 Merge pull request #575 from tonysyu/feature/viewer-linking
Linked image viewers and docked plugins
2013-06-28 08:32:34 -07:00
Josh Warner 026ca77cfa Merge pull request #588 from sciunto/range
FIX: cast range to list for python3 compatibility
2013-06-12 13:22:34 -07:00
Josh Warner 11ad6b812d Merge pull request #571 from ahojnnes/travis-fix
Fix: Use None instead of 'none' for qt_api (fix Travis error), set matplotlib backend
  also use python 3 print() in example.
2013-05-29 21:10:01 -07:00
Josh Warner df6da9fb9c Merge pull request #558 from chintak/convex_hull
FEAT: Function to compute separate convex hulls for unconnected objects
2013-05-28 22:37:11 -07:00
Josh Warner 03119e37b4 Merge pull request #551 from tonysyu/pyside
Add qt interface for PySide & PyQt4 compatibility in skimage-viewer
2013-05-26 18:58:37 -07:00
Josh Warner 210a25053a Merge pull request #545 from odebeir/master
fix: docstring in rank/percentile and remove unused p1
2013-05-11 14:12:39 -07:00
Josh Warner 33811074fc Merge pull request #526 from sciunto/fixtravis 2013-04-22 22:22:03 -07:00