wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-20 12:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,427 Commits 8 Branches 45 Tags
ba1d2ee3639037bea4bc8f3ea45094de939f0b58
Commit Graph
66 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Warner 46cbff8c2e Merge pull request #1638 from ahojnnes/doc-fixes 
DOC: Docstring fixes for recently merged code
 2015-08-20 21:06:32 -05:00
Josh Warner 24b3a81dd9 Merge pull request #1604 from blink1073/pil-close 
FIX: Do not let PIL manage the file handle.
 2015-07-14 21:47:32 -05:00
Josh Warner 2690fef1db Merge pull request #1607 from blink1073/faster-travis 
TST: Use new Travis containers for faster CI builds
 2015-07-14 07:42:20 -05:00
Josh Warner 17b882aae5 Merge pull request #1565 from blink1073/viewer-ax 
ENH: Allow viewer plot plugin to have tools.
 2015-07-12 15:24:55 -05:00
Josh Warner 81d89b5518 Merge pull request #1598 from stefanv/bug/line_aa_horiz_vert 
FIX: Fix and clean up anti-aliased line drawing
 2015-07-12 12:27:33 -05:00
Josh Warner 661b8e60c0 Merge pull request #1573 from jni/contributing-array-coords 
DOC: Add array coords and Cython-Python wrapping to new contributors guide
 2015-07-11 00:10:42 -05:00
Josh Warner 3ce57f244b Merge pull request #1576 from belltailjp/fix-broken-link-to-daisy-implementation 
DOC: Fix broken hyperlink to daisy code
 2015-07-04 11:38:37 -05:00
Josh Warner 17a1121e42 Merge pull request #595 from TimSC/fasthog 
ENH: Fast, Cython based hog implementation
 2015-07-04 10:49:56 -05:00
Josh Warner 360892c9de Merge pull request #1553 from blink1073/tifffile-package 
FIX: Use files from tifffile 0.6.2 package
 2015-06-30 16:22:46 -05:00
Josh Warner be5f6fdc3f Merge pull request #1562 from warmspringwinds/example_correction 
DOCFIX: Add missing visualization of MB-LBP plot
 2015-06-18 12:47:24 -05:00
Josh Warner 7a2b0a70f5 Merge pull request #1459 from vighneshbirodkar/seam_carving 
FEAT: Seam Carving
 2015-06-18 12:32:19 -05:00
Josh Warner 91f74fd6c6 Merge pull request #1536 from warmspringwinds/mb-lbp 
FEAT: multi-block local binary patterns (MB-LBP)
 2015-06-16 12:43:32 -05:00
Josh Warner b4a3985c41 Merge pull request #1555 from sciunto/user_guide-joblib 
DOC: Add link joblib website in userguide
 2015-06-15 21:04:00 -05:00
Josh Warner 86624a2818 Merge pull request #1558 from blink1073/optimized-window 
ENH: Create an optimal_step parameter for view_as_windows
 2015-06-15 20:50:36 -05:00
Josh Warner 7132df764e Merge pull request #1550 from jni/ndi 
STY: Harmonize scipy.ndimage usage across the library
 2015-06-10 22:16:00 -05:00
Josh Warner 46057c489b Merge pull request #1535 from stefanv/doc/installation 
DOC: Simplify installation instructions
 2015-06-07 19:05:59 -05:00
Josh Warner 84c79541a5 Merge pull request #1546 from blink1073/window-size 
ENH: Allow ``view_as_windows`` to take a non-tuple step, and update tests
 2015-06-07 16:08:47 -05:00
Josh Warner 3faa32149a Merge pull request #1526 from arve0/installation_instructions 
Add dask[array], improve CI builds, update install instructions
 2015-05-29 10:38:09 -05:00
Josh Warner 4e1e861c21 Merge pull request #1523 from warmspringwinds/ellipse-doc-correction 
DOC: corrected ellipse documentation
 2015-05-21 02:02:25 -05:00
Josh Warner 87355f4667 Merge pull request #1513 from joelfrederico/skimage-measure-regionprops-doc 
DOC: Update regionprops.weighted_moments_central doc
 2015-05-14 20:03:46 -05:00
Josh Warner cde04ad964 Merge pull request #1507 from arve0/pop_bilateral_docstring_typo 
DOC: Fix minor typo in pop_bilateral docstring
 2015-05-12 11:54:56 -05:00
Josh Warner c8a3df5521 Merge pull request #1455 from stefanv/doc/release_notes_and_installation 
DOC: Remove coverage table. Add document with release notes and download instructions.
 2015-05-07 01:17:00 -05:00
Josh Warner 208736a985 Merge pull request #1468 from stefanv/docs/api_cython_funcs 
DOCFIX: Pick up Cython functions when building docs API
 2015-04-12 09:51:23 -05:00
Josh Warner 3e9506c6b3 Merge pull request #1457 from blink1073/fix-pkg-resources 
FIX: Fix setup to allow installing from PyPI
 2015-03-29 21:54:11 -05:00
Josh Warner f9b85c454e Merge pull request #1446 from arve0/readme_typo 
STY: Close conda install code string in README
 2015-03-24 13:37:55 -05:00
Josh Warner 660c161cbf Merge pull request #1388 from arve0/move_docstrings_to_init 
DOC: Move viewer.widgets docstring to __init__.py
 2015-03-14 16:24:56 -05:00
Josh Warner 3aa767de0c Merge pull request #1424 from blink1073/contrast-check-function 
FIX: Handle Sphinx 1.3 API change
 2015-03-14 14:23:54 -05:00
Josh Warner 1712ee0722 Merge pull request #1413 from ahojnnes/inf 
Use np.inf instead of float('inf')
 2015-03-09 18:51:08 -05:00
Josh Warner 23f1a88578 Merge pull request #1391 from ahojnnes/eigvals-fix 
FIX: Hessian matrix eigvals computation
 2015-02-24 12:36:03 -06:00
Josh Warner 4644bdd347 Merge pull request #874 from emmanuelle/nlm_denoise 
FEAT: NL-means denoising
 2015-02-19 16:53:58 -06:00
Josh Warner 5247c36af7 Merge pull request #1380 from arve0/fix_Blitmanager.remove_artists 
FIX: Remove artist from artists, not itself
 2015-02-18 16:41:53 -06:00
Josh Warner 3f33ce7797 Merge pull request #1378 from arve0/fix_canny_simple_viewer_example 
FIX: Use feature.canny in viewer example
 2015-02-18 16:33:38 -06:00
Josh Warner b34f7aac45 Merge pull request #1367 from blink1073/fix-deprecated-decorators 
FIX: Cannot use bare deprecated decorators
 2015-02-03 22:06:38 -07:00
Josh Warner 8b24d27155 Merge pull request #1355 from kevin-keraudren/peak_local_max-NDarrays-issue1354 
ENH: Full ndarray support for peak_local_max
 2015-01-24 18:17:28 -07:00
Josh Warner d853f5ca94 Merge pull request #1344 from sciunto/doc 
DOC: Fix minor typos in draw docstrings
 2015-01-22 14:29:48 -07:00
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