diff -urN CImg-1.5.8.orig/CImg.h CImg-1.5.8/CImg.h --- CImg-1.5.8.orig/CImg.h 2014-04-17 15:41:15.000000000 +0200 +++ CImg-1.5.8/CImg.h 2014-04-18 15:51:02.000000000 +0200 @@ -2882,42 +2882,43 @@ // Define a 12x13 font (small size). const char *const data_font12x13 = -" .wjwlwmyuw>wjwkwbwjwkwRxuwmwjwkwmyuwJwjwlx`w zY}M|nwuw2wqwqwryrwqwqyowqwqwqwqwqwqwqwqwqwqwqwqwr{qyo{o{o{o{owkwkwkwkznwsxnymymymymycwuynznznznzm" -"wmwkwuynznznznznznznyuzrymymymymynwkwkwkwjynwswnymymymymybzmznznznznwlzmw hwHwlwSwTw wjwkwbwjwkwRxuwmwjwkwmyuwJwjwlx`w Fw mwlwlwuwnwuynwuwmyTwlwkwuwmwuwnwlwkwuwmwuw_wuxl" +"wlwkwuwnwuynwuwTwlwlwtwnwtwnw my Qw +wlw b{ \\w Wx`xTw_w[wbxawSwkw nynwkyw bwswcwkwuwjwuwozpwtwuwnwtwowkwjwmwuwuwkwIxmxuxowuwmwswowswmxnwjwhwowswowsw0wmwowswuwnwrwowswpwswowkwjwrwqw" +"rwpwkwkwtwnwkxsxqxswowswpwswnwswpwswowrwnwmwrwqwqwqwswswrwswowswjwpwlxjwkxuxLw[wcw_wSwkw mw\"wlwiw=wtwmxlwFw cwswnwuwnwkwjwswo{pwrwpwtwtwpwswby`w`yUwlw" +"twpwqwpwswowlw\\wrwrxuwHwrwfwuwjwlwlwTyuwVwlwtwawswowswowswcwuwmwuwmwuwmwuwmwuwlwkwuwnwswpwkwkwkwkwkwkwkwkwswoxswowswowswowswowswowswowrwpwswpwrwpwrwpw" +"rwpwrwpwswoznwtw Ww (wGwtwtwqwqwqwuwuwuwqwswuwqwqw=wqxtw`{nzp~q{ozowrwnxmwtwow bzawkwuwl}rwuwnwtwuwnwtwowkwjwlyjwIwlwswmwiwkwnwuwnwkwhwnwswowswowkwew" +"ewixnwsytwswuwnwrwpwkwrwpwkwkwkwrwpwkwkwuwmwkxsxqwuwtwpwqwqwswowqwqwswowiwmwrwpwswowtwtwpwuwmwuwjwowkwjwlxsxXynzmymznyozlzoznwkwkwtwnwkzuyrzmynzmzowux" +"myozmwswpwrwowtwtwrwrwpwrwp{mwlwiwHyuwpwtwkwmxlynzoxswmwmwswnwswowtxq|owtwtwpym{p{owswnwuwmwlwkwqwqxuwuxqwrwpwtwtwqwqwowlwuwuwkwmwlwtwowuwuwdwjznwl{nw" +"uwnwkx_wtxtwswtwlwtwWwuytwgyjwmwjwawswoyuwVwlwtwnwtwmwtwnwtwmwuwmwlwuwmwuwmwuwmwuwmwuwmwuwmxuwowkwkwkwkwkwkwkwkwkwrwpwuwtwpwqwqwqwqwqwqwqwqwqwowtwpwsw" +"uwqwrwpwrwpwrwpwrwowuwnwswowuwlymymymymymymyuyqymymymymynwkwkwkwjynzmymymymymykwmzowswowswowswowswpwrwozowrwW}q}qwtwtwqwtwtwqwtwtwA}rwuw_{p~r~r}pwtwow" +"rwnxmwtwow aw_w]wtwpwuwmxuwmybwjwlyjwIwlwswmwiwnynwtwnznzkwmynwswTyp}pylwmwtwtwtwswuwn{owkwrwp{o{owk|pwkwkxlwkwuwuwuwqwuwtwpwqwqwswowqwqwswoykwmwrwpws" +"wowuwuwuwowkwjwnwkwjwDwowswowkwswowswowkwswowswowkwkwuwmwkwswswswswowswowswowswoxlwswowkwswpwrwowtwtwqwtwowrwlwoxkwhxVxuxpwtypwuwjwnwtwnwkwswowtxnxmws" +"wowqwqwtwuxqwtwnwtwtwqwswowswmwm{nwuwlxnwkwqwqwtwtwqwrwpwtwtwqwuyuwpwiwhwnwmwrwnwbwkwuwlwlwswoxuxowlwtw`wuwrwszmwtwo}dwuwtwuw[}qymx`wswoyuwow_ylxlwtwo" +"yuwoyuwoyuwmwlwuwmwuwmwuwmwuwmwuwmwuwmwt{swk{o{o{o{owkwkwkwlztwpwuwtwpwqwqwqwqwqwqwqwqwqwnxowtwtwqwrwpwrwpwrwpwrwnwmwswowuwiwkwkwkwkwkwkwswswkwswowswo" +"wswowswowkwkwkwkwswowswowswowswowswowswowswcwtxowswowswowswowswpwrwowswpwrwWwtwtwqwqwqwuwuwuwqwuwswqwqw>wowuw`}q~q|q}qwrwpwrwowtwnwtwo~ izaw]wtwoykwux" +"qwtwswfwjwmwuwuwn}eyaxlwswmwjwjwpwswjwowswmwmwswnzWy]ypwlwtwtwuwswswowrwpwkwrwpwkwkwsyqwrwpwkwkwuwmwkwuwuwuwqwtwuwpwqwqznwqwqzkynwmwrwowuwnwuwuwuwowkw" +"jwnwkxkwGzowswowkwswo{owkwswowswowkwkxlwkwswswswswowswowswowswowjxmwkwswowtwnwuwuwuwpxmwtwlwlwlwiwlytwewtwtwqwswowtxoznwswnxmwswnwuwmwuwnwswowtwtwqwtw" +"twqwtwnwtwtwqwswowswmwmwswowswmwmwkwqwqwtwtwqwrwowuwuwpwuyuwq~own~own~owbwkwuwmznwswmwbwswawuwrwgwtwhwdwuytwXwJwswnxuw=wtwmwswowtxowswqxmwswowswowswow" +"swowswowswnwtwowkwkwkwkwkwkwkwkwkwrwpwtwuwpwqwqwqwqwqwqwqwqwqwnxowtwtwqwrwpwrwpwrwpwrwnwmwswowtwmznznznznznzn~swk{o{o{o{owkwkwkwkwswowswowswowswowswow" +"swowswo}qwuwuwowswowswowswowswowtwnwswowtwUwuwuwowswowswowswowsw@}qx`}q~pzo{pwrwpwrwowtwnwtwow aw_w_}owuwmwuwtwrwswuwewjwkwiwJwkwswmwkwiwp|kwowswmwmws" +"wkwWym}mypwlwszr{owrwpwkwrwpwkwkwqwqwrwpwkwkwtwnwkwtwtwqwtwuwpwqwqwkwqwqwtwiwnwmwrwowuwnwuwuwuwpwuwlwkwmwjwkwHwswowswowkwswowkwkwswowswowkwkwuwmwkwsws" +"wswswowswowswowswowhwnwkwswowtwnwuwuwuwpxmwtwmwkwlwiwmwtydwtwtwqwswowswowtwnwswowkwswnwuwnwtwnwswowtwtwqwtwtwqwtwnwtwtwqwswowswmwmwswowswnwlwkwqwqxuwu" +"xqwrwnyowqwpwiwhwpwuwuwowrwpwuwuwdwkwuwlwlwswo{owkxuwawtxtwszmwtwiwdwuwtwuwXwJwswmwuwKzmwtwlwtxowrwpwtxrxl{o{o{o{o{o{o{owkwkwkwkwkwkwkwkwkwrwpwtwuwpwq" +"wqwqwqwqwqwqwqwqwowtwpwuwswqwrwpwrwpwrwpwrwnwmznwswowswowswowswowswowswowswowswowkwkwkwkwkwkwkwkwkwswowswowswowswowswowswowswcwuwuwowswowswowswowswowt" +"wnwswowtwTymymymymy=wmw^wuwuwmxlxmyowrwowtwnwtwmxmw bwswIwuwmwuwmwuwtwrxswdwjw]wJwkxuxmwlwlwswlwjwowswmwmwswlwSycyawlwswowrwowswpwswowkwjwrwqwrwpwkwkw" +"swowkwqwqwsxowswpwjwswpwswowrwnwmxtxnwlwswpwswmwlwlwjwkwHwswowswowkwswowswowkwswowswowkwkwtwnwkwswswswswowswowswowswowkwswowkwswnxlwswpwtwmxmwjwlwiwTx" +"uxpwtxowswowtwnwswowkwswnynwtwnwswowtwtwqxuwuxqwtwnwtwtwqwswowswmwlwuwnwswowkwjwswo{pwrwmwmwswnwjwiwnymwtwnycwkwuwlwl{mwmwiw_wrwdwtwVwrw*wswmwuw?wtwlw" +"tzqwrwpwtzswkwswowswowswowswowswowswowswnwswpwkwkwkwkwkwkwkwkwswowsxowswowswowswowswowswowrwpwswpxtxpxtxpxtxpxtxnwmwkwswowswowswowswowswowswowswowtxow" +"kwswowswowswowswowkwkwkwkwswowswowswowswowswowswowswlwnxtwowswowswowswowswnxmwswnx >wlw\\wkx`wnwrwoznwtwmxl| gybw^wtwozmwsxpzuxfxlx]wnw_wlxjyn{o{nykwnz" +"mymwkynymwkwewewjwjwrwswqwp{myozn{owizpwrwpwkwkwrwp{owqwqwsxnyowiyowrwozmwlzmwlwswqxsxnwm}qwjxlwGzozmymznynwjzowswowkwkwswowkwswswswswnynzmzowjymxlznx" +"lwswqwrwnwm{mwlwiwHxuxpzmxlymynwswmwnwrwozmxuxo{pwtxn{pzmykwmyo}p{owkyuynwnwrwmwly`w_w_wbwjzo{pwqwnwmwhw_z>zY}M|nwuw2wqwqwryrwqwqyowqwqwqwqwqwqwqwqwqw" +"qwqwqwr{qyo{o{o{o{owkwkwkwkznwsxnymymymymycwuynznznznzmwmwkwuynznznznznznznyuzrymymymymynwkwkwkwjynwswnymymymymybzmznznznznwlzmw hwHwlwSwTw + CImgList operator,(const CImg& img) const { + return (+*this).insert(img); + } + //! Return a copy of the list instance, where all elements of input list \c list have been inserted at the end. /** \param list List inserted at the end of the instance copy. @@ -42281,6 +42288,12 @@ return insert(list); } + //! Return a copy of the list instance, where all elements of input list \c list have been inserted at the end \const. + template + CImgList& operator,(const CImgList& list) const { + return (+*this).insert(list); + } + //! Return image corresponding to the appending of all images of the instance list along specified axis. /** \param axis Appending axis. Can be { 'x' | 'y' | 'z' | 'c' }. @@ -46308,6 +46321,7 @@ CImg canvas; if (msg) ((CImg().draw_text(0,0,"%s",gray,0,1,13,msg)*=-1)+=200).resize(-100,-100,1,3).move_to(canvas); + const unsigned int bwall = (buttons._width-1)*(12+bw) + bw, w = cimg::max(196U,36+logo._width+canvas._width,24+bwall), Files CImg-1.5.8.orig/html/CImg_reference.pdf and CImg-1.5.8/html/CImg_reference.pdf differ diff -urN CImg-1.5.8.orig/html/reference/functions_0x6f.html CImg-1.5.8/html/reference/functions_0x6f.html --- CImg-1.5.8.orig/html/reference/functions_0x6f.html 2014-04-17 15:41:26.000000000 +0200 +++ CImg-1.5.8/html/reference/functions_0x6f.html 2014-04-18 15:51:11.000000000 +0200 @@ -189,38 +189,38 @@ : CImg< T >
  • operator--() -: CImg< T > +: CImg< T >
  • operator-=() -: CImg< T > +: CImg< T >
  • operator/() -: CImg< T > +: CImg< T >
  • operator/=() : CImg< T >
  • operator<() -: CImg< T > -, CImgList< T > +: CImgList< T > +, CImg< T >
  • operator<<() -: CImg< T > +: CImg< T >
  • operator<<=() : CImg< T >
  • operator=() : CImgList< T > -, CImg< T > , CImgDisplay , CImg< T > -, CImgList< T > +, CImgList< T > +, CImg< T > +, CImgList< T > , CImg< T > -, CImgList< T >
  • operator==() -: CImg< T > +: CImg< T >
  • operator>() : CImgList< T > @@ -229,19 +229,19 @@ : CImg< T >
  • operator>>=() -: CImg< T > +: CImg< T >
  • operator^() -: CImg< T > +: CImg< T >
  • operator^=() -: CImg< T > +: CImg< T >
  • operator|() -: CImg< T > +: CImg< T >
  • operator|=() -: CImg< T > +: CImg< T >
  • operator~() : CImg< T > diff -urN CImg-1.5.8.orig/html/reference/functions_func_0x6f.html CImg-1.5.8/html/reference/functions_func_0x6f.html --- CImg-1.5.8.orig/html/reference/functions_func_0x6f.html 2014-04-17 15:41:26.000000000 +0200 +++ CImg-1.5.8/html/reference/functions_func_0x6f.html 2014-04-18 15:51:11.000000000 +0200 @@ -189,38 +189,38 @@ : CImg< T >
  • operator--() -: CImg< T > +: CImg< T >
  • operator-=() -: CImg< T > +: CImg< T >
  • operator/() -: CImg< T > +: CImg< T >
  • operator/=() : CImg< T >
  • operator<() -: CImg< T > -, CImgList< T > +: CImgList< T > +, CImg< T >
  • operator<<() -: CImg< T > +: CImg< T >
  • operator<<=() : CImg< T >
  • operator=() : CImgList< T > -, CImg< T > , CImgDisplay , CImg< T > -, CImgList< T > +, CImgList< T > +, CImg< T > +, CImgList< T > , CImg< T > -, CImgList< T >
  • operator==() -: CImg< T > +: CImg< T >
  • operator>() : CImgList< T > @@ -229,19 +229,19 @@ : CImg< T >
  • operator>>=() -: CImg< T > +: CImg< T >
  • operator^() -: CImg< T > +: CImg< T >
  • operator^=() -: CImg< T > +: CImg< T >
  • operator|() -: CImg< T > +: CImg< T >
  • operator|=() -: CImg< T > +: CImg< T >
  • operator~() : CImg< T > diff -urN CImg-1.5.8.orig/html/reference/structcimg__library_1_1CImgList-members.html CImg-1.5.8/html/reference/structcimg__library_1_1CImgList-members.html --- CImg-1.5.8.orig/html/reference/structcimg__library_1_1CImgList-members.html 2014-04-17 15:41:17.000000000 +0200 +++ CImg-1.5.8/html/reference/structcimg__library_1_1CImgList-members.html 2014-04-18 15:51:05.000000000 +0200 @@ -269,7 +269,9 @@ operator()(const unsigned int pos, const unsigned int x, const unsigned int y=0, const unsigned int z=0, const unsigned int c=0) const CImgList< T > operator+() const CImgList< T > operator,(const CImg< t > &img)CImgList< T > - operator,(const CImgList< t > &list)CImgList< T > + operator,(const CImg< t > &img) const CImgList< T > + operator,(const CImgList< t > &list)CImgList< T > + operator,(const CImgList< t > &list) const CImgList< T > operator<(const char axis) const CImgList< T > operator=(const CImg< t > &img)CImgList< T > operator=(const CImgList< t > &list)CImgList< T > diff -urN CImg-1.5.8.orig/html/reference/structcimg__library_1_1CImgList.html CImg-1.5.8/html/reference/structcimg__library_1_1CImgList.html --- CImg-1.5.8.orig/html/reference/structcimg__library_1_1CImgList.html 2014-04-17 15:41:17.000000000 +0200 +++ CImg-1.5.8/html/reference/structcimg__library_1_1CImgList.html 2014-04-18 15:51:05.000000000 +0200 @@ -328,10 +328,20 @@ CImgList< T > & operator, (const CImg< t > &img)  Return a copy of the list instance, where image img has been inserted at the end. More...
      + +template<typename t > +CImgList< T > operator, (const CImg< t > &img) const + Return a copy of the list instance, where image img has been inserted at the end [const version].
    +  template<typename t > CImgList< T > & operator, (const CImgList< t > &list)  Return a copy of the list instance, where all elements of input list list have been inserted at the end. More...
      + +template<typename t > +CImgList< T > & operator, (const CImgList< t > &list) const + Return a copy of the list instance, where all elements of input list list have been inserted at the end [const version].
    +  CImg< T > operator> (const char axis) const  Return image corresponding to the appending of all images of the instance list along specified axis. More...