Expand _01 half<->float limitation to _finite. Simplify.

src/core/SkBitmap.cpp

 /*
  * Copyright 2008 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.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 583 matching lines @@
             SkPMColor c = SkSwizzle_BGRA_to_PMColor(addr[0]);
             return SkUnPreMultiply::PMColorToColor(c);
         }
         case kRGBA_8888_SkColorType: {
             uint32_t* addr = this->getAddr32(x, y);
             SkPMColor c = SkSwizzle_RGBA_to_PMColor(addr[0]);
             return SkUnPreMultiply::PMColorToColor(c);
         }
         case kRGBA_F16_SkColorType: {
             const uint64_t* addr = (const uint64_t*)fPixels + y * (fRowBytes >> 3) + x;
-            Sk4f p4 = SkHalfToFloat_01(addr[0]);
+            Sk4f p4 = SkHalfToFloat_finite(addr[0]);
             if (p4[3]) {
                 float inva = 1 / p4[3];
                 p4 = p4 * Sk4f(inva, inva, inva, 1);
             }
             SkColor c;
             SkNx_cast<uint8_t>(p4 * Sk4f(255) + Sk4f(0.5f)).store(&c);
             // p4 is RGBA, but we want BGRA, so we need to swap next
             return SkSwizzle_RB(c);
         }
         default:
@@ skipping 523 matching lines @@
 
 bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
     const size_t snugRB = buffer->readUInt();
     if (0 == snugRB) {  // no pixels
         return false;
     }
 
     SkImageInfo info;
     info.unflatten(*buffer);
 
-    // If there was an error reading "info" or if it is bogus, 
+    // If there was an error reading "info" or if it is bogus,
     // don't use it to compute minRowBytes()
     if (!buffer->validate(SkColorTypeValidateAlphaType(info.colorType(),
                                                        info.alphaType()))) {
         return false;
     }
 
     const size_t ramRB = info.minRowBytes();
     const int height = SkMax32(info.height(), 0);
     const uint64_t snugSize = sk_64_mul(snugRB, height);
     const uint64_t ramSize = sk_64_mul(ramRB, height);
@@ skipping 190 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif