diff --git a/.gitignore b/.gitignore index be4346b..f8662f7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /stb-5736b15f7ea0ffb08dd38af21067c314d6a3aae9.tar.gz /stb-c4bbb6e75f688318b2df2b70c2df2d641c1a8481.tar.gz /stb-beebb24b945efdea3b9bba23affb8eb3ba8982e7.tar.gz +/stb-b7cf1246284b49dfe7f1288e6f739b7a3a9d966b.tar.gz diff --git a/1561.patch b/1561.patch deleted file mode 100644 index 9d9e4a7..0000000 --- a/1561.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6e715778416b229799f85b49fa3ffc0400428f89 Mon Sep 17 00:00:00 2001 -From: "Jeff Roberts (LA)" -Date: Thu, 19 Oct 2023 17:42:58 -0700 -Subject: [PATCH] Fixed asan error on tiny input images - ---- - stb_image_resize2.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/stb_image_resize2.h b/stb_image_resize2.h -index e0c428246..1d7bed5bd 100644 ---- a/stb_image_resize2.h -+++ b/stb_image_resize2.h -@@ -1,4 +1,4 @@ --/* stb_image_resize2 - v2.01 - public domain image resizing -+/* stb_image_resize2 - v2.02 - public domain image resizing - - by Jeff Roberts (v2) and Jorge L Rodriguez - http://github.com/nothings/stb -@@ -3697,7 +3697,7 @@ static int stbir__pack_coefficients( int num_contributors, stbir__contributors* - float * coeffs = coefficents + widest * ( num_contributors - 1 ); - - // go until no chance of clipping (this is usually less than 8 lops) -- while ( ( ( contribs->n0 + widest*2 ) >= row_width ) && ( contribs >= contributors ) ) -+ while ( ( contribs >= contributors ) && ( ( contribs->n0 + widest*2 ) >= row_width ) ) - { - // might we clip?? - if ( ( contribs->n0 + widest ) > row_width ) diff --git a/sources b/sources index e1d8207..8e32061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stb-beebb24b945efdea3b9bba23affb8eb3ba8982e7.tar.gz) = 83f09092340f158772c467d2069309c06a7c888d710ea651a974d7be47391d78be36b76e4ad32a38972da5e78561ea8fa13a9e20a81c1b89ff00e8f3dd73c8ed +SHA512 (stb-b7cf1246284b49dfe7f1288e6f739b7a3a9d966b.tar.gz) = 86dc319e3ddfc5cc1e53d31b96c366418fa4551ddb9da5d48fdb7615e48f96fffb613fc86d1776d921d4ba3b2bc56564f8cf5ec258d0bf13cb050723799a5c60 diff --git a/stb.spec b/stb.spec index acabf37..c95d0e2 100644 --- a/stb.spec +++ b/stb.spec @@ -1,5 +1,5 @@ -%global commit beebb24b945efdea3b9bba23affb8eb3ba8982e7 -%global snapdate 20231011 +%global commit b7cf1246284b49dfe7f1288e6f739b7a3a9d966b +%global snapdate 20240208 # We choose not to package the “stb_include” library (stb_include.h) because, # during the package review, it was observed that it follows coding practices @@ -81,15 +81,6 @@ Patch: %{url}/pull/1236.patch # https://github.com/nothings/stb/pull/1547 Patch: %{url}/pull/1454.patch -# Fixed asan error on tiny input images -# https://github.com/nothings/stb/pull/1561 -# -# Fixes: -# -# stb_image_resize2.h: Address Sanitizer error -# https://github.com/nothings/stb/issues/1526 -Patch: %{url}/pull/1561.patch - # Fix integer overflow # https://github.com/nothings/stb/pull/1530 # @@ -200,9 +191,9 @@ Patch: %{url}/pull/1553.patch %global stb_easy_font_version 1.1 %global stb_herringbone_wang_tile_version 0.7 %global stb_hexwave_version 0.5 -%global stb_image_version 2.28 +%global stb_image_version 2.29 %global stb_image_resize_version 0.97 -%global stb_image_resize2_version 2.02 +%global stb_image_resize2_version 2.05 %global stb_image_write_version 1.16 %global stb_include_version 0.2 %global stb_leakcheck_version 0.6