[Bf-blender-cvs] [6e272b9ba42] master: BLI_math: add min/max utils for chars.

Bastien Montagne noreply at git.blender.org
Tue Apr 14 11:29:51 CEST 2020


Commit: 6e272b9ba429dc7f4fc7724f19254b1021a9559b
Author: Bastien Montagne
Date:   Tue Apr 14 11:29:10 2020 +0200
Branches: master
https://developer.blender.org/rB6e272b9ba429dc7f4fc7724f19254b1021a9559b

BLI_math: add min/max utils for chars.

===================================================================

M	source/blender/blenlib/BLI_math_base.h
M	source/blender/blenlib/intern/math_base_inline.c

===================================================================

diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index 7a9d17d2b05..ae9617d2f16 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -151,6 +151,9 @@ MINLINE int max_iiii(int a, int b, int c, int d);
 MINLINE size_t min_zz(size_t a, size_t b);
 MINLINE size_t max_zz(size_t a, size_t b);
 
+MINLINE char min_cc(char a, char b);
+MINLINE char max_cc(char a, char b);
+
 MINLINE int clamp_i(int value, int min, int max);
 MINLINE float clamp_f(float value, float min, float max);
 MINLINE size_t clamp_z(size_t value, size_t min, size_t max);
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index c4b68e9164c..e0cac508d28 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -524,6 +524,15 @@ MINLINE size_t max_zz(size_t a, size_t b)
   return (b < a) ? a : b;
 }
 
+MINLINE char min_cc(char a, char b)
+{
+  return (a < b) ? a : b;
+}
+MINLINE char max_cc(char a, char b)
+{
+  return (b < a) ? a : b;
+}
+
 MINLINE int clamp_i(int value, int min, int max)
 {
   return min_ii(max_ii(value, min), max);



More information about the Bf-blender-cvs mailing list