fix size_t/int warnings

include/core/SkEndian.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 SkEndian_DEFINED
@@ skipping 11 matching lines @@
     #error "can't have both LENDIAN and BENDIAN defined"
 #endif
 
 #if !defined(SK_CPU_LENDIAN) && !defined(SK_CPU_BENDIAN)
     #error "need either LENDIAN or BENDIAN defined"
 #endif
 
 /** Swap the two bytes in the low 16bits of the parameters.
     e.g. 0x1234 -> 0x3412
 */
-static inline uint16_t SkEndianSwap16(U16CPU value) {
+static inline uint16_t SkEndianSwap16(size_t value) {

[mtklein, 2014/04/23 13:36:18]

If you feel like being a little fancier, I think

template <typename T>
static inline uint16_t SkEndianSwap16(T value) {
   ...
}

conveys the we-take-anything nature of the function.

[reed1, 2014/04/23 14:04:22]

don't want to take any non-integral values (e.g. ptrs, floats, etc). Is size_t
sufficient, or would uintptr_t be cleaner?

     SkASSERT(value == (uint16_t)value);
     return static_cast<uint16_t>((value >> 8) | (value << 8));
 }
 template<uint16_t N> struct SkTEndianSwap16 {
     static const uint16_t value = static_cast<uint16_t>((N >> 8) | ((N & 0xFF) << 8));
 };
 
 /** Vector version of SkEndianSwap16(), which swaps the
     low two bytes of each value in the array.
 */
 static inline void SkEndianSwap16s(uint16_t array[], int count) {
     SkASSERT(count == 0 || array != NULL);
 
     while (--count >= 0) {
         *array = SkEndianSwap16(*array);
         array += 1;
     }
 }
 
 /** Reverse all 4 bytes in a 32bit value.
     e.g. 0x12345678 -> 0x78563412
 */
-static inline uint32_t SkEndianSwap32(uint32_t value) {
-    return  ((value & 0xFF) << 24) |
-            ((value & 0xFF00) << 8) |
-            ((value & 0xFF0000) >> 8) |
-            (value >> 24);
+static inline uint32_t SkEndianSwap32(size_t value) {

[mtklein, 2014/04/23 13:36:18]

This guy seems like he really wants to be u32 -> u32.  Maybe the fix is doing
the SkToU32 outside the call?

[reed1, 2014/04/23 14:04:22]

well, so does swap16, but the caller may give us larger types

+    uint32_t v = SkToU32(value);
+    return  ((v & 0xFF) << 24) |
+            ((v & 0xFF00) << 8) |
+            ((v & 0xFF0000) >> 8) |
+             (v >> 24);
 }
 template<uint32_t N> struct SkTEndianSwap32 {
     static const uint32_t value = ((N & 0xFF) << 24) |
                                   ((N & 0xFF00) << 8) |
                                   ((N & 0xFF0000) >> 8) |
                                   (N >> 24);
 };
 
 /** Vector version of SkEndianSwap32(), which swaps the
     bytes of each value in the array.
@@ skipping 116 matching lines @@
         SK_OT_BYTE f6 : 1; \
         SK_OT_BYTE f5 : 1; \
         SK_OT_BYTE f4 : 1; \
         SK_OT_BYTE f3 : 1; \
         SK_OT_BYTE f2 : 1; \
         SK_OT_BYTE f1 : 1; \
         SK_OT_BYTE f0 : 1;
 #endif
 
 #endif