refresh from trunk

- edge case fix in qsort compare proc (overflowing subtract)
- special case 1x1 bitmaps to draw as a color (much faster)

2 files changed, 26 insertions, 0 deletions

diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h
index 7658d5b..5129ac6 100644
--- a/include/core/SkColorPriv.h
+++ b/include/core/SkColorPriv.h
@@ -393,6 +393,21 @@ inline SkPMColor SkPixel16ToPixel32(U16CPU src)
     return SkPackARGB32(0xFF, r, g, b);
 }
 
+// similar to SkPixel16ToPixel32, but returns SkColor instead of SkPMColor
+static inline SkColor SkPixel16ToColor(U16CPU src) {
+    SkASSERT(src == SkToU16(src));
+    
+    unsigned    r = SkPacked16ToR32(src);
+    unsigned    g = SkPacked16ToG32(src);
+    unsigned    b = SkPacked16ToB32(src);
+    
+    SkASSERT((r >> (8 - SK_R16_BITS)) == SkGetPackedR16(src));
+    SkASSERT((g >> (8 - SK_G16_BITS)) == SkGetPackedG16(src));
+    SkASSERT((b >> (8 - SK_B16_BITS)) == SkGetPackedB16(src));
+    
+    return SkColorSetRGB(r, g, b);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef uint16_t SkPMColor16;
diff --git a/include/core/SkTDArray.h b/include/core/SkTDArray.h
index 5f6bbd8..954bcf8 100644
--- a/include/core/SkTDArray.h
+++ b/include/core/SkTDArray.h
@@ -86,6 +86,17 @@ public:
         SkTSwap(fCount, other.fCount);
     }
 
+    /** Return a ptr to the array of data, to be freed with sk_free. This also
+        resets the SkTDArray to be empty.
+     */
+    T* detach() {
+        T* array = fArray;
+        fArray = NULL;
+        fReserve = fCount = 0;
+        SkDEBUGCODE(fData = NULL;)
+        return array;
+    }
+
     bool isEmpty() const { return fCount == 0; }
     int count() const { return fCount; }
     T*  begin() const { return fArray; }