From 1e1f22b3a9e0feebcac608e168ff7227f9c894d4 Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Fri, 22 Nov 2024 17:43:30 +0100 Subject: [PATCH 1/2] Auto-commit for release 3.5.0_pre --- html/header.html | 2 +- html/header_doxygen.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/header.html b/html/header.html index 8200b8fc..1cd30634 100644 --- a/html/header.html +++ b/html/header.html @@ -23,7 +23,7 @@
Logo

- Latest stable version: 3.4.3        Current pre-release: 3.4.4 (2024/11/20) + Latest stable version: 3.4.3        Current pre-release: 3.5.0 (2024/11/22)


diff --git a/html/header_doxygen.html b/html/header_doxygen.html index 50e125f5..b716f0a2 100644 --- a/html/header_doxygen.html +++ b/html/header_doxygen.html @@ -26,7 +26,7 @@
Logo

- Latest stable version: 3.4.3        Current pre-release: 3.4.4 (2024/11/20) + Latest stable version: 3.4.3        Current pre-release: 3.5.0 (2024/11/22)


From a99554887f23378528f43ba8a0702541e876284c Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Fri, 22 Nov 2024 19:42:01 +0100 Subject: [PATCH 2/2] . --- CImg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CImg.h b/CImg.h index 7fed33f9..84686a3b 100644 --- a/CImg.h +++ b/CImg.h @@ -40951,7 +40951,7 @@ namespace cimg_library { (_kernel._depth<=3 && _kernel._width<=3 && _kernel._height<=3)) && xstride==1 && ystride==1 && zstride==1 && xoffset>=0 && yoffset>=0 && zoffset>=0 && - xoffset + _xsize<_width && yoffset + _ysize<_height && zoffset + _zsize<_depth) { + xoffset + _xsize<=_width && yoffset + _ysize<=_height && zoffset + _zsize<=_depth) { const unsigned int M = cimg::max(_kernel._width,_kernel._height,_kernel._depth); _kernel.assign(_kernel.get_resize(M + 1 - (M%2),M + 1 - (M%2),_kernel._depth>1?M + 1 - (M%2):1,-100, 0,0,1,1,1),false); @@ -40967,7 +40967,7 @@ namespace cimg_library { _xcenter==_kernel.width()/2 && _ycenter==_kernel.height()/2 && _zcenter==_kernel.depth()/2 && xstride==1 && ystride==1 && zstride==1 && xoffset>=0 && yoffset>=0 && zoffset>=0 && - xoffset + _xsize<_width && yoffset + _ysize<_height && zoffset + _zsize<_depth) { + xoffset + _xsize<=_width && yoffset + _ysize<=_height && zoffset + _zsize<=_depth) { switch (_kernel._depth) { case 3 : { // 3x3x3 centered kernel @@ -41149,7 +41149,7 @@ namespace cimg_library { !_xcenter && !_ycenter && !_zcenter && xstride==1 && ystride==1 && zstride==1 && xoffset>=0 && yoffset>=0 && zoffset>=0 && - xoffset + _xsize<_width && yoffset + _ysize<_height && zoffset + _zsize<_depth) { + xoffset + _xsize<=_width && yoffset + _ysize<=_height && zoffset + _zsize<=_depth) { // Special optimization for 1x1 kernel. cimg_pragma_openmp(parallel for cimg_openmp_if(is_outer_parallel))