remove outdated debugging code now that we no longer support fixed point

include/core/SkScalar.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkScalar_DEFINED
@@ skipping 49 matching lines @@
         // We rely on the following behavior of infinities and nans
         // 0 * finite --> 0
         // 0 * infinity --> NaN
         // 0 * NaN --> NaN
         float prod = x * 0;
         // At this point, prod will either be NaN or 0
         // Therefore we can return (prod == prod) or (0 == prod).
         return prod == prod;
     }
 
-#ifdef SK_DEBUG
-    /** SkIntToScalar(n) returns its integer argument as an SkScalar
-     *
-     * If we're compiling in DEBUG mode, and can thus afford some extra runtime
-     * cycles, check to make sure that the parameter passed in has not already
-     * been converted to SkScalar.  (A double conversion like this is harmless
-     * for SK_SCALAR_IS_FLOAT, but for SK_SCALAR_IS_FIXED this causes trouble.)
-     *
-     * Note that we need all of these method signatures to properly handle the
-     * various types that we pass into SkIntToScalar() to date:
-     * int, size_t, U8CPU, etc., even though what we really mean is "anything
-     * but a float".
-     */
-    static inline float SkIntToScalar(signed int param) {
-        return (float)param;
-    }
-    static inline float SkIntToScalar(unsigned int param) {
-        return (float)param;
-    }
-    static inline float SkIntToScalar(signed long param) {
-        return (float)param;
-    }
-    static inline float SkIntToScalar(unsigned long param) {
-        return (float)param;
-    }
-    static inline float SkIntToScalar(float /* param */) {
-        /* If the parameter passed into SkIntToScalar is a float,
-         * one of two things has happened:
-         * 1. the parameter was an SkScalar (which is typedef'd to float)
-         * 2. the parameter was a float instead of an int
-         *
-         * Either way, it's not good.
-         */
-        SkDEBUGFAIL("looks like you passed an SkScalar into SkIntToScalar");
-        return (float)0;
-    }
-#else  // not SK_DEBUG
     /** SkIntToScalar(n) returns its integer argument as an SkScalar
     */
     #define SkIntToScalar(n)        ((float)(n))
-#endif // not SK_DEBUG
     /** SkFixedToScalar(n) returns its SkFixed argument as an SkScalar
     */
     #define SkFixedToScalar(x)      SkFixedToFloat(x)
     /** SkScalarToFixed(n) returns its SkScalar argument as an SkFixed
     */
     #define SkScalarToFixed(x)      SkFloatToFixed(x)
 
     #define SkScalarToFloat(n)      (n)
     #define SkFloatToScalar(n)      (n)
 
@@ skipping 249 matching lines @@
             return false;
         }
     }
     return true;
 #else
     return 0 == memcmp(a, b, n * sizeof(SkScalar));
 #endif
 }
 
 #endif