Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
dtschump committed Nov 24, 2023
2 parents 12a6219 + 84913e1 commit 648a1bb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
18 changes: 12 additions & 6 deletions CImg.h
Original file line number Diff line number Diff line change
Expand Up @@ -24247,9 +24247,11 @@ namespace cimg_library {
}

static double mp_c2o(_cimg_math_parser& mp) {
mp_check_list(mp,"c2o");
unsigned int ind = (unsigned int)mp.opcode[2];
if (ind!=~0U) ind = (unsigned int)cimg::mod((int)_mp_arg(2),mp.imglist.width());
if (ind!=~0U) {
mp_check_list(mp,"c2o");
ind = (unsigned int)cimg::mod((int)_mp_arg(2),mp.imglist.width());
}
const CImg<T> &img = ind==~0U?mp.imgin:mp.imglist[ind];
const int
x = (int)_mp_arg(3),
Expand Down Expand Up @@ -25006,10 +25008,12 @@ namespace cimg_library {
}

static double mp_ellipse(_cimg_math_parser& mp) {
mp_check_list(mp,"ellipse");
const unsigned int i_end = (unsigned int)mp.opcode[2];
unsigned int ind = (unsigned int)mp.opcode[3];
if (ind!=~0U) ind = (unsigned int)cimg::mod((int)_mp_arg(3),mp.imglist.width());
if (ind!=~0U) {
mp_check_list(mp,"ellipse");
ind = (unsigned int)cimg::mod((int)_mp_arg(3),mp.imglist.width());
}
CImg<T> &img = ind==~0U?mp.imgout:mp.imglist[ind];
CImg<T> color(img._spectrum,1,1,1,0);
bool is_invalid_arguments = false, is_outlined = false;
Expand Down Expand Up @@ -27173,9 +27177,11 @@ namespace cimg_library {
}

static double mp_o2c(_cimg_math_parser& mp) {
mp_check_list(mp,"o2c");
unsigned int ind = (unsigned int)mp.opcode[2];
if (ind!=~0U) ind = (unsigned int)cimg::mod((int)_mp_arg(2),mp.imglist.width());
if (ind!=~0U) {
mp_check_list(mp,"o2c");
ind = (unsigned int)cimg::mod((int)_mp_arg(2),mp.imglist.width());
}
const CImg<T> &img = ind==~0U?mp.imgin:mp.imglist[ind];
longT offset = (longT)_mp_arg(3);
double *ptrd = &_mp_arg(1) + 1;
Expand Down
2 changes: 1 addition & 1 deletion html/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="header">
<a href="index.html"><img alt="Logo" src="img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
<h2 style="padding-bottom: 1em">
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.2</a></b>
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.2</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.3.3</a></b> (2023/11/24)
</h2>

<hr/>
Expand Down
2 changes: 1 addition & 1 deletion html/header_doxygen.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="header">
<a href="../index.html"><img alt="Logo" src="../img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
<h2 style="padding-bottom: 1em">
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.2</a></b>
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.3.2</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.3.3</a></b> (2023/11/24)
</h2>

<hr/>
Expand Down

0 comments on commit 648a1bb

Please sign in to comment.