From 984daa26d4a022697d402b0f8aa58ab32453d745 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 22 Apr 2023 07:09:17 -0400 Subject: [PATCH] release --- configure | 6 +++--- m4/version.m4 | 2 +- magick/cache.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 33a37718c..61e1b39ba 100755 --- a/configure +++ b/configure @@ -5121,7 +5121,7 @@ MAGICK_PATCHLEVEL_VERSION=86 MAGICK_VERSION=6.9.12-86 -MAGICK_GIT_REVISION=b73b18581:20230416 +MAGICK_GIT_REVISION=24ed66478:20230421 # Substitute library versioning @@ -5145,7 +5145,7 @@ PACKAGE_BASE_VERSION=6.9.12 PACKAGE_PATCHLEVEL_VERSION=86 -if test "y" = 'y'; then +if test "n" = 'y'; then PACKAGE_VERSION_ADDENDUM='-86 (Beta)' else PACKAGE_VERSION_ADDENDUM=-86 @@ -5155,7 +5155,7 @@ PACKAGE_LIB_VERSION=0x69C PACKAGE_LIB_VERSION_NUMBER=6,9,12,86 -PACKAGE_RELEASE_DATE=2023-04-16 +PACKAGE_RELEASE_DATE=2023-04-21 # Ensure that make can run correctly diff --git a/m4/version.m4 b/m4/version.m4 index 44a83270e..c91c26066 100644 --- a/m4/version.m4 +++ b/m4/version.m4 @@ -28,7 +28,7 @@ m4_define([magick_major_version], [6]) m4_define([magick_minor_version], [9]) m4_define([magick_micro_version], [12]) m4_define([magick_patchlevel_version], [86]) -m4_define([magick_is_beta], [y]) +m4_define([magick_is_beta], [n]) m4_define([magick_base_version], [magick_major_version.magick_minor_version.magick_micro_version]) m4_define([magick_version], diff --git a/magick/cache.c b/magick/cache.c index 85d2a8c19..c6eb05f78 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -5169,9 +5169,9 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info, static inline MagickBooleanType ValidatePixelOffset(const ssize_t x, const size_t a) { - if ((x >= 0) && (x >= ((ssize_t) (MAGICK_SSIZE_MAX/5-a)))) + if ((x >= 0) && (x >= ((ssize_t) (MAGICK_SSIZE_MAX-5*a)))) return(MagickFalse); - if (x <= ((ssize_t) (MAGICK_SSIZE_MIN/5+a))) + if (x <= ((ssize_t) (MAGICK_SSIZE_MIN+5*a))) return(MagickFalse); return(MagickTrue); }