Skip to content

Commit c90b687

Browse files
committed
.
1 parent 5e6f0be commit c90b687

3 files changed

Lines changed: 1952 additions & 844 deletions

File tree

CImg.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5970,6 +5970,7 @@ namespace cimg_library {
59705970
/**
59715971
\param command C-string containing the command line to execute.
59725972
\param module_name Module name.
5973+
\param is_verbose Tell if command must be silent or verbose when outputing messages.
59735974
\return Status value of the executed command, whose meaning is OS-dependent.
59745975
\note This function is similar to <tt>std::system()</tt>
59755976
but it does not open an extra console windows
@@ -7711,7 +7712,7 @@ namespace cimg_library {
77117712

77127713
//! Get file size.
77137714
/**
7714-
\param filename Specified filename to get size from.
7715+
\param file Specified file to get size from.
77157716
\return File size or '-1' if file does not exist.
77167717
**/
77177718
inline cimg_int64 fsize(std::FILE *const file) {
@@ -41996,8 +41997,8 @@ namespace cimg_library {
4199641997
\param zsize Depth of the resulting image (~0U means 'instance_depth/zstride').
4199741998
\note
4199841999
- The correlation of the image instance \p *this by the kernel \p kernel is defined to be:
41999-
res(x,y,z) = sum_{i,j,k} (*this)(\alpha_x\;x + \beta_x\;(i - c_x),\alpha_y\;y + \beta_y\;(j -
42000-
c_y),\alpha_z\;z + \beta_z\;(k - c_z))*kernel(i,j,k).
42000+
$res(x,y,z) = sum_{i,j,k} (*this)(\alpha_x\;x + \beta_x\;(i - c_x),\alpha_y\;y + \beta_y\;(j -
42001+
c_y),\alpha_z\;z + \beta_z\;(k - c_z))*kernel(i,j,k).$
4200142002
**/
4200242003
template<typename t>
4200342004
CImg<T>& correlate(const CImg<t>& kernel, const unsigned int boundary_conditions=1,
@@ -53006,6 +53007,7 @@ namespace cimg_library {
5300653007
\param pattern Drawing pattern.
5300753008
\param font_height Height of the labels (exact match for 13,23,53,103, interpolated otherwise).
5300853009
\param allow_zero Enable/disable the drawing of label '0' if found.
53010+
\param round_x
5300953011
**/
5301053012
template<typename t, typename tc>
5301153013
CImg<T>& draw_axis(const CImg<t>& values_x, const int y,
@@ -53056,6 +53058,7 @@ namespace cimg_library {
5305653058
\param pattern Drawing pattern.
5305753059
\param font_height Height of the labels (exact match for 13,23,53,103, interpolated otherwise).
5305853060
\param allow_zero Enable/disable the drawing of label '0' if found.
53061+
\param round_y
5305953062
**/
5306053063
template<typename t, typename tc>
5306153064
CImg<T>& draw_axis(const int x, const CImg<t>& values_y,
@@ -53110,6 +53113,8 @@ namespace cimg_library {
5311053113
\param pattern_y Drawing pattern for the Y-axis.
5311153114
\param font_height Height of the labels (exact match for 13,23,53,103, interpolated otherwise).
5311253115
\param allow_zero Enable/disable the drawing of label '0' if found.
53116+
\param round_x
53117+
\param round_y
5311353118
**/
5311453119
template<typename tx, typename ty, typename tc>
5311553120
CImg<T>& draw_axes(const CImg<tx>& values_x, const CImg<ty>& values_y,
@@ -53637,7 +53642,7 @@ namespace cimg_library {
5363753642
\param y0 Y-coordinate of the upper-left pixel.
5363853643
\param x1 X-coordinate of the lower-right pixel.
5363953644
\param y1 Y-coordinate of the lower-right pixel.
53640-
\param palette Colormap.
53645+
\param colormap Colormap.
5364153646
\param opacity Drawing opacity.
5364253647
\param z0r Real part of the upper-left fractal vertex.
5364353648
\param z0i Imaginary part of the upper-left fractal vertex.
@@ -55313,6 +55318,7 @@ namespace cimg_library {
5531355318
\param feature_type Type of feature to select. Can be <tt>{ 0=point | 1=line | 2=rectangle | 3=ellipse }</tt>.
5531455319
\param XYZ Pointer to 3 values X,Y,Z which tells about the projection point coordinates, for volumetric images.
5531555320
\param exit_on_anykey Exit function when any key is pressed.
55321+
\param is_deep_selection_default
5531655322
**/
5531755323
CImg<T>& select(CImgDisplay &disp,
5531855324
const unsigned int feature_type=2, unsigned int *const XYZ=0,
@@ -59928,7 +59934,7 @@ namespace cimg_library {
5992859934

5992959935
//! Load image from a camera stream, using OpenCV.
5993059936
/**
59931-
\param index Index of the camera to capture images from (from 0 to 63).
59937+
\param camera_index Index of the camera to capture images from (from 0 to 63).
5993259938
\param capture_width Width of the desired image ('0' stands for default value).
5993359939
\param capture_height Height of the desired image ('0' stands for default value).
5993459940
\param skip_frames Number of frames to skip before the capture.
@@ -68777,7 +68783,7 @@ namespace cimg_library {
6877768783

6877868784
//! Return a CImg pre-defined font with requested height.
6877968785
/**
68780-
\param font_height Height of the desired font (exact match for 13,23,53,103).
68786+
\param requested_height Height of the desired font (exact match for 13,23,53,103).
6878168787
\param is_variable_width Decide if the font has a variable (\c true) or fixed (\c false) width.
6878268788
\note Beware, the returned reference is valid only until the next call to this function!
6878368789
**/

0 commit comments

Comments
 (0)