Commit cc278992 authored by David Tschumperlé's avatar David Tschumperlé

.

parent 8067e45d
......@@ -17956,7 +17956,8 @@ namespace cimg_library_suffixed {
s0 = s1 = std::strchr(ss,'['); if (s0) { do { --s1; } while (cimg::is_blank(*s1)); cimg::swap(*s0,*++s1); }
if ((*ss=='I' || *ss=='J') && *ss1=='[' &&
(reserved_label[(int)*ss]==~0U || !_cimg_mp_is_vector(reserved_label[(int)*ss]))) { // Image value as a vector
(reserved_label[(int)*ss]==~0U ||
!_cimg_mp_is_vector(reserved_label[(int)*ss]))) { // Image value as a vector
if (*ss2=='#') { // Index specified
s0 = ss3; while (s0<se1 && (*s0!=',' || level[s0 - expr._data]!=clevel1)) ++s0;
p1 = compile(ss3,s0++,depth1,0,is_single);
......@@ -17999,7 +18000,8 @@ namespace cimg_library_suffixed {
}
if ((*ss=='i' || *ss=='j') && *ss1=='[' &&
(reserved_label[(int)*ss]==~0U || !_cimg_mp_is_vector(reserved_label[(int)*ss]))) { // Image value as a scalar
(reserved_label[(int)*ss]==~0U ||
!_cimg_mp_is_vector(reserved_label[(int)*ss]))) { // Image value as a scalar
if (*ss2=='#') { // Index specified
s0 = ss3; while (s0<se1 && (*s0!=',' || level[s0 - expr._data]!=clevel1)) ++s0;
p1 = compile(ss3,s0++,depth1,0,is_single);
......@@ -600,7 +600,9 @@ void* item_virtual_landscape() {
void* item_plasma() {
CImg<float> plasma, camp(3), cfreq(3), namp(3), nfreq(3);
CImgList<unsigned char> font = CImgList<unsigned char>::font(53);
CImg<unsigned char> visu(400,300,1,3,0), letter, scroll(visu.width() + 2*font[(int)'W'].width(),font[(int)'W'].height(),1,1,0);
CImg<unsigned char>
visu(400,300,1,3,0), letter,
scroll(visu.width() + 2*font[(int)'W'].width(),font[(int)'W'].height(),1,1,0);
const char *text = " * The CImg Library : C++ Template Image Processing Toolkit *";
CImgDisplay disp(visu,"[#13] - Plasma Effect");
const unsigned char white[] = { 255, 255, 255 };
......
......@@ -71,7 +71,7 @@ int main(int argc,char **argv) {
// Init fonts
CImgList<> font_full = CImgList<>::font(13,false);
font_full.remove(0,255);
const int fw = font_full['A'].width(), fh = font_full['A'].height();
const int fw = font_full[(int)'A'].width(), fh = font_full[(int)'A'].height();
CImgList<> font, font_blur;
CImgList<unsigned char> font_code;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment