fix size_t/int warnings

src/core/SkScalerContext.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkScalerContext.h"
@@ skipping 530 matching lines @@
 static void packA8ToA1(const SkMask& mask, const uint8_t* src, size_t srcRB) {
     const int height = mask.fBounds.height();
     const int width = mask.fBounds.width();
     const int octs = width >> 3;
     const int leftOverBits = width & 7;
 
     uint8_t* dst = mask.fImage;
     const int dstPad = mask.fRowBytes - SkAlign8(width)/8;
     SkASSERT(dstPad >= 0);
 
-    const int srcPad = srcRB - width;
-    SkASSERT(srcPad >= 0);
+    SkASSERT(srcRB >= (size_t)width);

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

Is it sensible to add in SkASSERT(width >= 0) here?  It'd make me stop worrying
about conversions and signs.

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

yes, width should be >= 0. Will add that assert.

+    const size_t srcPad = srcRB - width;
 
     for (int y = 0; y < height; ++y) {
         for (int i = 0; i < octs; ++i) {
             *dst++ = pack_8_to_1(src);
             src += 8;
         }
         if (leftOverBits > 0) {
             unsigned bits = 0;
             int shift = 7;
             for (int i = 0; i < leftOverBits; ++i, --shift) {
@@ skipping 418 matching lines @@
 SkScalerContext* SkTypeface::createScalerContext(const SkDescriptor* desc,
                                                  bool allowFailure) const {
     SkScalerContext* c = this->onCreateScalerContext(desc);
 
     if (!c && !allowFailure) {
         c = SkNEW_ARGS(SkScalerContext_Empty,
                        (const_cast<SkTypeface*>(this), desc));
     }
     return c;
 }