Skip to content

Commit 86ec1b6

Browse files
committed
Merge pull request #3737 from jenshnielsen/rgb2lab_minimal
Rgb2lab minimal
2 parents 99c4b6f + 7cd109b commit 86ec1b6

File tree

5 files changed

+729
-4
lines changed

5 files changed

+729
-4
lines changed

LICENSE/LICENSE_SCIKIT-IMAGE

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Unless otherwise specified by LICENSE.txt files in individual
2+
directories, all code is
3+
4+
Copyright (C) 2011, the scikit-image team
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without
8+
modification, are permitted provided that the following conditions are
9+
met:
10+
11+
1. Redistributions of source code must retain the above copyright
12+
notice, this list of conditions and the following disclaimer.
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
3. Neither the name of skimage nor the names of its contributors may be
18+
used to endorse or promote products derived from this software without
19+
specific prior written permission.
20+
21+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
22+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24+
DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
25+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
26+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
27+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
29+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
30+
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31+
POSSIBILITY OF SUCH DAMAGE.

doc/users/plotting/colormaps/Lfunction.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
import numpy as np
88
import matplotlib.pyplot as plt
9-
from skimage import color
9+
import colorconv as color
10+
#from skimage import color
11+
# we are using a local copy of colorconv from scikit-image to reduce dependencies.
12+
# You should probably use the one from scikit-image in most cases.
1013
import matplotlib as mpl
1114
from matplotlib import cm
1215

0 commit comments

Comments
 (0)