mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-01-31 04:25:40 +00:00
Squashed 'external/CImg/' changes from 4d061dcd6..049267da1
049267da1 . d974f83e1 . 143c6f781 . 8b641fa30 . 79ab52e6f . 593667dcf Auto-commit for release 3.2.6_pre a5305a976 . 6fa06681b . cdc9ee87a . 5f40398d1 Start work on next version 3.2.6. 78d1f0d7d Final release 3.2.5 620e4155c . be214a006 . 1f9896c3a Add support for 'id#ind' in math parser. 44800102a Add support for 'id#ind' in math parser. a6657d3d1 Auto-commit for release 3.2.5_pre 70e9a2cc3 . a77287fe0 . 05fd7a869 . 81c22bb46 . 1f14f5eff . bd1228f0f . 19e44e564 . 3f19980fc Start work on v.3.2.5. 504f5c653 . 26862961d Fix line width. 860b3747d Optimize cimg_math_parser::mp_vector_norm() by avoiding copies. 44eb192e9 . c8d8710ee . 1cf8f5c27 . 7b6ec0809 . 99871e252 Simplify CImg<T>::draw_polygon() and CImg<T>::draw_line(). 30ec22fde . a2c50471e . d2f63a9f8 Fix possible issue in 'CImg::draw_polygon()' (better fix). e0675260c Fix possible issue in 'CImg::draw_polygon()'. bb9980723 . c431612a1 . 3606c5f5b Auto-commit for release 3.2.4_pre d5d63e21f . acea91b06 . 9a3c772fa . ccb519bc0 . 9bf62d16b . 0936bc4b7 math evaluator: Add function 'unitnorm(V,p). 5236bd690 . 95ff538e1 . 3285740e9 . 7d01d9b70 Start work on 3.2.4 c7868e298 . 903cc805d . f03139316 math_parser(): Add function 'c2o()' (coordinates to offset). ff49ec20f math_parser(): Add function 'o2c()' (offset to coordinates). 6cbef2c1d Start working on version 3.2.3 ba9bb02a8 Final release 3.2.2 998d0157c . 1bb2d4f00 . 722646c42 Attempt to fix compilation on Windows. 2f3c64511 . 113a16334 . e67bdf5d9 . 31fe9269c . 64839222d Better support of 'CImg<unsigned long long>' and 'CImg<long long>'. 32b3bb6ff Add specific cimg::type() traits for 'unsigned long long' and 'long long'. 806ef2861 Start work on 3.2.2 b558be730 Final release 3.2.1 85aa2ac2e . bcafdc4d9 . a6961a5bd . 33b78048e . 3c063517e . 9c76c1842 . 87863667a . d60290f8d . 3b75fa436 . f1815c88a . 6f575e662 . 5d6be92b4 Allow dynamic arrays to have larger size (32bits integers, i.e 2G elements). c7d1772b8 . 977a1bb81 . 2cf046326 . 54d2b753c . f4a0f772d . d11a0380e . 4828190aa math_parser: Check that specified '#index' of functions are not NaN. 3b71fa0ce Function 'v2s()': Add option to 0-pad integer values. 652e6604b . ea3197ce4 Fix #374 c88e03819 math_parser: Add function that computes the square root of complex numbers. b58775209 Add detection of the not operator in fast pre-evaluation of math expressions. 5e3585553 Add detection of the not operator in fast pre-evaluation of math expressions. 209c38da9 . 6ba3d0a11 Fix #319. 4e9412e8d Start work on next version 3.2.1 57028920e . 9772e0204 . 446c39411 Math evaluator: Add new function 'abort()'. 3c2ecee1f Make fast string comparisons more robust when expressions contain blank characters. af9ecf8d0 Optimize evaluation of string comparisons. edfcda038 . 00cab3cea . a0af5312c . 6a92e46f2 . 7ae52c28d cimg_math_parser(): Add 'gamma()' function. ad516d976 . b71e2db76 . a9633d4ed . 9d8406e57 . 103d23625 . 6349c771f . bef50f9d8 . 391a24013 . d4669fbbc . 5e77a9c7e . 86440098e . 6b9eee37c . 616484469 . e79edfdb9 . e616c2443 . 772fa4dca . git-subtree-dir: external/CImg git-subtree-split: 049267da171c50ab48f93c7285f096d7d686e8f3
This commit is contained in:
Leon Styhre
parent
6c5f42416f
commit
2016fd6f5c
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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> 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' />
|
||||
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' />
|
||||
<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' />
|
||||
<span style="color: forestgreen">Book</span></span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<hr/>
|
||||
|
|
|
|||
|
|
@ -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> 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' />
|
||||
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' />
|
||||
<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' />
|
||||
<span style="color: forestgreen">Book</span></span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<hr/>
|
||||
|
|
|
|||
BIN
html/img/book_cimg_en.jpg
Normal file
BIN
html/img/book_cimg_en.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -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 & 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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue