Merge pull request #5238 from LorenaGdL:master

This commit is contained in:
Alexander Alekhin 2015-08-24 00:47:00 +00:00
commit c385ac575d

View File

@ -3768,7 +3768,7 @@ 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 //!< ![hot](pics/colormaps/colorscale_parula.jpg)
COLORMAP_PARULA = 12 //!< ![parula](pics/colormaps/colorscale_parula.jpg)
};
/** @brief Applies a GNU Octave/MATLAB equivalent colormap on a given image.