Merge commit '2016fd6f5c3d0576722ff49e1aa34fdb69eaf8a9' into library-updates

This commit is contained in:
Leon Styhre 2023-08-05 10:49:38 +02:00
commit 6e94da0bf7
8 changed files with 1123 additions and 583 deletions

1515
external/CImg/CImg.h vendored

File diff suppressed because it is too large Load diff

View file

@ -1288,7 +1288,7 @@ void* item_breakout() {
board.fill(0); visu0 = background;
cimg_forXY(board,x,y) if (0.2f + cimg::rand(-1,1)>=0) {
CImg<float> cbrick = CImg<double>::vector(100 + cimg::rand()*155,100 + cimg::rand()*155,100 + cimg::rand()*155).
unroll('v').resize(brick.width(),brick.height());
unroll('c').resize(brick.width(),brick.height());
cimg_forC(cbrick,k) (cbrick.get_shared_channel(k).mul(brick))/=255;
visu0.draw_image(x*32,y*16,cbrick);
board(x,y) = 1;

View file

@ -119,9 +119,9 @@ int main(int argc,char **argv) {
(rtype==4?"Gouraud-shaded faces":(rtype==5?"Phong-shaded faces":"Isophotes"))))));
static bool first_time = true;
if (rtype==6) visu.display_object3d(disp,isopoints,isoprimitives,isocolors,first_time,1,-1,true,
500.0f,0.0f,0.0f,-5000.0f,0.0f,0.0f,true,pose.data());
500.0f,0.0f,0.0f,-5000.0f,0.0f,0.0f,true,pose.data(),true);
else visu.display_object3d(disp,points,primitives,colors,first_time,rtype,-1,true,
500.0f,0.0f,0.0f,-5000.0f,0.0f,0.0f,true,pose.data());
500.0f,0.0f,0.0f,-5000.0f,0.0f,0.0f,true,pose.data(),true);
first_time = false;
switch (disp.key()) {
case 0: break;

View file

@ -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_3.1.6.zip">3.1.6</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.2.0</a></b>
Latest stable version: <b><a href="http://cimg.eu/files/CImg_3.2.5.zip">3.2.5</a></b>
</h2>
<hr/>
@ -55,9 +55,9 @@
<li><a href='links.html'><span>
<img alt="Links" src='img/menu_links.png' />&nbsp;&nbsp;
Links</span></a></li>
<li><a target="_blank" href='https://www.amazon.fr/dp/B08WRCZRR3/ref=cm_sw_em_r_mt_dp_Y4VV7GNQSBQDZ4XQ95YR'><span style="background-color:khaki">
<img alt="Book_fr" src='img/menu_tutorial.png' />&nbsp;&nbsp;
<span style="color: forestgreen">Book (Fr)</span></span></a>
<li><a target="_blank" href='https://www.taylorfrancis.com/books/mono/10.1201/9781003323693/digital-image-processing-vincent-barra-christophe-tilmant-david-tschumperle'><span style="background-color:khaki">
<img alt="Book" src='img/menu_tutorial.png' />&nbsp;&nbsp;
<span style="color: forestgreen">Book</span></span></a></li>
</ul>
</div>
<hr/>

View file

@ -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_3.1.6.zip">3.1.6</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.2.0</a></b>
Latest stable version: <b><a href="http://cimg.eu/files/CImg_3.2.5.zip">3.2.5</a></b>
</h2>
<hr/>
@ -58,9 +58,9 @@
<li><a href='../links.html'><span>
<img alt="Links" src='../img/menu_links.png' />&nbsp;&nbsp;
Links</span></a></li>
<li><a target="_blank" href='https://www.amazon.fr/dp/B08WRCZRR3/ref=cm_sw_em_r_mt_dp_Y4VV7GNQSBQDZ4XQ95YR'><span style="background-color:khaki">
<img alt="Book_fr" src='../img/menu_tutorial.png' />&nbsp;&nbsp;
<span style="color: forestgreen">Book (Fr)</span></span></a>
<li><a target="_blank" href='https://www.taylorfrancis.com/books/mono/10.1201/9781003323693/digital-image-processing-vincent-barra-christophe-tilmant-david-tschumperle'><span style="background-color:khaki">
<img alt="Book" src='img/menu_tutorial.png' />&nbsp;&nbsp;
<span style="color: forestgreen">Book</span></span></a></li>
</ul>
</div>
<hr/>

BIN
external/CImg/html/img/book_cimg_en.jpg vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View file

@ -106,15 +106,20 @@
</div><div class="section_end"></div>
<!-- ************* -->
<!-- Book (Fr) -->
<!-- Book (En/Fr) -->
<!-- ************* -->
<div class="section_title"><p>Book (Fr)</div><div class="section_content">
<div class="section_title"><p>Book (En/Fr)</div><div class="section_content">
<ul>
<li>If you understand French, you may be interested by <a href="https://www.amazon.fr/dp/B08WRCZRR3/ref=cm_sw_em_r_mt_dp_Y4VV7GNQSBQDZ4XQ95YR">the nice book we wrote</a>
on how to use the <span class="gmd_cimg"></span> Library to develop image processing algorithms, from scratch.
In these 318 pages, we review the important concepts of the library and address a wide variety of applications in image processing
<li>We have a comprehensive book, written in English, on how to use the <span class="gmd_cimg"></span> Library
to develop various image processing algorithms, from scratch
(published by <a href="https://www.taylorfrancis.com/books/mono/10.1201/9781003323693/digital-image-processing-vincent-barra-christophe-tilmant-david-tschumperle">Taylor &amp; Francis Group</a>).
In this 308 pages book, we review the important concepts of the library and address a wide variety of applications in image processing
(<i>Filtering, Mathematical Morphology, Feature Extraction, Segmentation, Multispectral Approaches, 3D Visualization, etc.</i>).<br/><br/>
<a target="_blank" href="https://www.taylorfrancis.com/books/mono/10.1201/9781003323693/digital-image-processing-vincent-barra-christophe-tilmant-david-tschumperle"><img class="center_image" src="img/book_cimg_en.jpg" /></a><br/>
</li>
<li>
If you understand French, you may be interested by the <a href="https://www.amazon.fr/dp/B08WRCZRR3/ref=cm_sw_em_r_mt_dp_Y4VV7GNQSBQDZ4XQ95YR">French version of this book</a><br/><br/>
<a target="_blank" href="https://www.amazon.fr/dp/B08WRCZRR3/ref=cm_sw_em_r_mt_dp_Y4VV7GNQSBQDZ4XQ95YR"><img class="center_image" src="img/book_cimg.jpg" /></a>
</li>
</ul>

View file

@ -10,6 +10,6 @@ REM ----------------------------------------------------------------
CD ..\examples\
SET CPPFILE=CImg_demo captcha curve_editor2d dtmri_view3d edge_explorer2d fade_images gaussian_fit1d generate_loop_macros hough_transform2d image2ascii image_registration2d image_surface3d jawbreaker mcf_levelsets2d mcf_levelsets3d odykill pde_heatflow2d pde_TschumperleDeriche2d plotter1d radon_transform2d scene3d spherical_function3d tetris tron tutorial wavelet_atrous use_chlpca use_draw_gradient use_nlmeans use_RGBclass use_skeleton
FOR %%F IN (%CPPFILE%) DO (
cl /W4 /wd"4127" /wd"4311" /wd"4312" /wd"4512" /wd"4571" /wd"4640" /wd"4706" /wd"4710" /wd"4800" /wd"4804" /wd"4820" /wd"4996" /Ox /Ob2 /Oi /Ot /c /EHsc /D "_CRT_SECURE_NO_WARNINGS" /I"%SDKPATH%\Include" /I"..\\" %%F.cpp
cl /W4 /wd"4127" /wd"4311" /wd"4312" /wd"4512" /wd"4571" /wd"4640" /wd"4706" /wd"4710" /wd"4800" /wd"4804" /wd"4820" /wd"4996" /c /EHsc /D "_CRT_SECURE_NO_WARNINGS" /I"%SDKPATH%\Include" /I"..\\" %%F.cpp
link /LIBPATH:"%SDKPATH%\Lib" %%F.obj user32.lib gdi32.lib shell32.lib
)