Add SkDivMod with a special case for ARM.

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 "SkBitmap.h"
@@ skipping 893 matching lines @@
 bool get_upper_left_from_offset(SkBitmap::Config config, size_t offset, size_t rowBytes,
                                    int32_t* x, int32_t* y);
 bool get_upper_left_from_offset(SkBitmap::Config config, size_t offset, size_t rowBytes,
                                    int32_t* x, int32_t* y) {
     SkASSERT(x != NULL && y != NULL);
     if (0 == offset) {
         *x = *y = 0;
         return true;
     }
     // Use integer division to find the correct y position.
-    *y = SkToS32(offset / rowBytes);
     // The remainder will be the x position, after we reverse get_sub_offset.
-    *x = SkToS32(offset % rowBytes);
+    size_t xSizeT, ySizeT;

[reed1, 2013/09/20 19:02:39]

do we really need to have two local vars to call this? :(
If we had SkDivMod32() hard coded to int32_t, could we avoid this?

[mtklein, 2013/09/20 19:29:35]

We could, but that'd force offset and rowBytes to cast down.

How do you feel about this version, which allows the inputs and outputs to be
different types?

+    SkDivMod(offset, rowBytes, &ySizeT, &xSizeT);
+    *y = SkToS32(ySizeT);
+    *x = SkToS32(xSizeT);
     switch (config) {
         case SkBitmap::kA8_Config:
             // Fall through.
         case SkBitmap::kIndex8_Config:
             // x is unmodified
             break;
 
         case SkBitmap::kRGB_565_Config:
             // Fall through.
         case SkBitmap::kARGB_4444_Config:
@@ skipping 773 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif