More general version of image filtering; reworked to be robust and easier to SSE

include/core/SkBitmap.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 SkBitmap_DEFINED
@@ skipping 520 matching lines @@
      *  the cpu, then so will the dst. If the src pixels are allocated on the
      *  gpu (typically as a texture), the it will do the same for the dst.
      *  If the request cannot be fulfilled, returns false and dst is unmodified.
      */
     bool deepCopyTo(SkBitmap* dst, Config c) const;
 
     /** Returns true if this bitmap can be deep copied into the requested config
         by calling copyTo().
      */
     bool canCopyTo(Config newConfig) const;
-
+    
     /**
      *  DEPRECATED -- will be replaced with API on SkPaint
      */
     void buildMipMap(bool forceRebuild = false);
 
 #ifdef SK_BUILD_FOR_ANDROID
     bool hasHardwareMipMap() const {
         return (fFlags & kHasHardwareMipMap_Flag) != 0;
     }
 
@@ skipping 143 matching lines @@
 
     static SkFixed ComputeMipLevel(SkFixed sx, SkFixed dy);
 
     /** Given scale factors sx, sy, determine the miplevel available in the
      bitmap, and return it (this is the amount to shift matrix iterators
      by). If dst is not null, it is set to the correct level.
      */
     int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy);
     bool hasMipMap() const;
     void freeMipMap();
+    
+    /** Make a scaled copy of this bitmap into the provided destination.
+      * The caller is responsible for having set the width and height of the
+      * provided destination bitmap, and also having allocated its pixel memory.
+      * 
+      * This function is temporary and for testing purposes only; it will likely
+      * move once it has been properly plumbed into the bitmap shader infrastructure.

[reed1, 2013/07/09 17:26:29]

this is an 80-col file

[humper, 2013/07/09 17:46:13]

Done.

+      */
+      
+    void scale(SkBitmap *dst) const;

[humper, 2013/07/09 17:21:18]

Made private; disabled the GM and bench.

 
     friend struct SkBitmapProcState;
 };
 
 class SkAutoLockPixels : public SkNoncopyable {
 public:
     SkAutoLockPixels(const SkBitmap& bm, bool doLock = true) : fBitmap(bm) {
         fDidLock = doLock;
         if (doLock) {
             bm.lockPixels();
@@ skipping 96 matching lines @@
 
 // returns the address of the byte that contains the x coordinate
 inline uint8_t* SkBitmap::getAddr1(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kA1_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     return (uint8_t*)fPixels + y * fRowBytes + (x >> 3);
 }
 
 #endif