Merge pull request #14 from tomcombriat/work/fix_13

Bugfix in NI autoadjust

Author: tomcombriat

src/FixMath.h

@@ -1073,7 +1073,7 @@ class SFix
   static constexpr int8_t getNF() {return NF;}
 
 
-  /** Check wether this number exceeds the given total size in bits. See UFix::asssertSize().
+  /** Check wether this number exceeds the given total size in bits. See UFix::assertSize().
    *
    *  @note This function counts the number of bits needed, internally, and including the sign bit.
    *        E.g. SFix<8,0>::assertSize<8>() will fail, as it requires 9 bits, internally!
@@ -1083,7 +1083,7 @@ class SFix
   template<int8_t, int8_t, uint64_t> friend class UFix;  // for access to UFixNIadj_t
   template<int8_t, int8_t, uint64_t> friend class SFix;
   static constexpr uint64_t maxRANGE(int8_t delta_bits=0) { return (uint64_t(1)<<(NI+NF+delta_bits)); } // no -1 for signed, because negative number actually extend to -2^n, not just 2^n-1
-  typedef UFix<(RANGE > maxRANGE()) ? NI+1 : (RANGE > maxRANGE(-1)) ? NI : NI-1, NF, RANGE> SFixNIadj_t;
+  typedef SFix<(RANGE > maxRANGE()) ? NI+1 : (RANGE > maxRANGE(-1)) ? NI : NI-1, NF, RANGE> SFixNIadj_t;
 
   internal_type internal_value;
   //static constexpr internal_type onesbitmask() { return (internal_type) ((1ULL<< (NI+NF)) - 1); }

src/FixMath_Autotests.h

@@ -57,7 +57,7 @@ namespace FixMathPrivate {
       static_assert(SFix<4, 3>(-1) == SFix<4, 5>(-1)); // NOTE This is a simpler test case for the above problem. Note the difference in NF, which prompts shifting
 #endif
       // here's a variant that avoids the problem by using only positive numbers
-      static_assert(UFix<12,1>(999) - UFix<43,9>(0) - b - a == UFix<19,3>(999) + (-(a+b)));
+      static_assert(UFix<12,1>(999) - UFix<43,9>(0) - b - a == UFix<19,2>(999) + (-(a+b)));
       static_assert(-SFix<4, 3>(-8, true) == -SFix<4, 5>(-32, true));
 
       // multiplication