From a756b03ebcc4366a670dfcbb2ce7c54369f445ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Tschumperl=C3=A9?= <David.Tschumperle@gmail.com>
Date: Wed, 26 Sep 2018 10:46:48 +0200
Subject: [PATCH] .
---
CImg.h | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/CImg.h b/CImg.h
index 74e2f7e..0c77f9d 100644
--- a/CImg.h
+++ b/CImg.h
@@ -19930,15 +19930,15 @@ namespace cimg_library_suffixed {
unsigned int scalar1(const mp_func op, const unsigned int arg1) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1) && op!=mp_copy?arg1:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1) && op!=mp_copy?arg1:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1).move_to(code);
return pos;
}
unsigned int scalar2(const mp_func op, const unsigned int arg1, const unsigned int arg2) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2).move_to(code);
return pos;
}
@@ -19946,9 +19946,9 @@ namespace cimg_library_suffixed {
unsigned int scalar3(const mp_func op,
const unsigned int arg1, const unsigned int arg2, const unsigned int arg3) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
- arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
+ arg3!=~0U && arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2,arg3).move_to(code);
return pos;
}
@@ -19957,10 +19957,10 @@ namespace cimg_library_suffixed {
const unsigned int arg1, const unsigned int arg2, const unsigned int arg3,
const unsigned int arg4) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
- arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
- arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
+ arg3!=~0U && arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
+ arg4!=~0U && arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2,arg3,arg4).move_to(code);
return pos;
}
@@ -19969,11 +19969,11 @@ namespace cimg_library_suffixed {
const unsigned int arg1, const unsigned int arg2, const unsigned int arg3,
const unsigned int arg4, const unsigned int arg5) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
- arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
- arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
- arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
+ arg3!=~0U && arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
+ arg4!=~0U && arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
+ arg5!=~0U && arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2,arg3,arg4,arg5).move_to(code);
return pos;
}
@@ -19982,12 +19982,12 @@ namespace cimg_library_suffixed {
const unsigned int arg1, const unsigned int arg2, const unsigned int arg3,
const unsigned int arg4, const unsigned int arg5, const unsigned int arg6) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
- arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
- arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
- arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:
- arg6>_cimg_mp_slot_c && _cimg_mp_is_comp(arg6)?arg6:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
+ arg3!=~0U && arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
+ arg4!=~0U && arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
+ arg5!=~0U && arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:
+ arg6!=~0U && arg6>_cimg_mp_slot_c && _cimg_mp_is_comp(arg6)?arg6:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2,arg3,arg4,arg5,arg6).move_to(code);
return pos;
}
@@ -19997,13 +19997,13 @@ namespace cimg_library_suffixed {
const unsigned int arg4, const unsigned int arg5, const unsigned int arg6,
const unsigned int arg7) {
const unsigned int pos =
- arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
- arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
- arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
- arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
- arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:
- arg6>_cimg_mp_slot_c && _cimg_mp_is_comp(arg6)?arg6:
- arg7>_cimg_mp_slot_c && _cimg_mp_is_comp(arg7)?arg7:scalar();
+ arg1!=~0U && arg1>_cimg_mp_slot_c && _cimg_mp_is_comp(arg1)?arg1:
+ arg2!=~0U && arg2>_cimg_mp_slot_c && _cimg_mp_is_comp(arg2)?arg2:
+ arg3!=~0U && arg3>_cimg_mp_slot_c && _cimg_mp_is_comp(arg3)?arg3:
+ arg4!=~0U && arg4>_cimg_mp_slot_c && _cimg_mp_is_comp(arg4)?arg4:
+ arg5!=~0U && arg5>_cimg_mp_slot_c && _cimg_mp_is_comp(arg5)?arg5:
+ arg6!=~0U && arg6>_cimg_mp_slot_c && _cimg_mp_is_comp(arg6)?arg6:
+ arg7!=~0U && arg7>_cimg_mp_slot_c && _cimg_mp_is_comp(arg7)?arg7:scalar();
CImg<ulongT>::vector((ulongT)op,pos,arg1,arg2,arg3,arg4,arg5,arg6,arg7).move_to(code);
return pos;
}
--
GitLab