Merge pull request #13587 from catree:add_matplotlib_colormaps

pull/13604/head^2
Alexander Alekhin 6 years ago
commit ebe14fa4ac
  1. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_cividis.jpg
  2. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_inferno.jpg
  3. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_magma.jpg
  4. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_plasma.jpg
  5. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_twilight.jpg
  6. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_twilight_shifted.jpg
  7. BIN
      modules/imgproc/doc/pics/colormaps/colorscale_viridis.jpg
  8. 9
      modules/imgproc/include/opencv2/imgproc.hpp
  9. 177
      modules/imgproc/src/colormap.cpp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -4349,7 +4349,14 @@ enum ColormapTypes
COLORMAP_HSV = 9, //!< ![HSV](pics/colormaps/colorscale_hsv.jpg)
COLORMAP_PINK = 10, //!< ![pink](pics/colormaps/colorscale_pink.jpg)
COLORMAP_HOT = 11, //!< ![hot](pics/colormaps/colorscale_hot.jpg)
COLORMAP_PARULA = 12 //!< ![parula](pics/colormaps/colorscale_parula.jpg)
COLORMAP_PARULA = 12, //!< ![parula](pics/colormaps/colorscale_parula.jpg)
COLORMAP_MAGMA = 13, //!< ![magma](pics/colormaps/colorscale_magma.jpg)
COLORMAP_INFERNO = 14, //!< ![inferno](pics/colormaps/colorscale_inferno.jpg)
COLORMAP_PLASMA = 15, //!< ![plasma](pics/colormaps/colorscale_plasma.jpg)
COLORMAP_VIRIDIS = 16, //!< ![viridis](pics/colormaps/colorscale_viridis.jpg)
COLORMAP_CIVIDIS = 17, //!< ![cividis](pics/colormaps/colorscale_cividis.jpg)
COLORMAP_TWILIGHT = 18, //!< ![twilight](pics/colormaps/colorscale_twilight.jpg)
COLORMAP_TWILIGHT_SHIFTED = 19 //!< ![twilight shifted](pics/colormaps/colorscale_twilight_shifted.jpg)
};
/** @example samples/cpp/falsecolor.cpp

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save