New bitmap filter checkin; this time with less build breakage
BUG=
Review URL: https://codereview.chromium.org/18942002
git-svn-id: http://skia.googlecode.com/svn/trunk/include@9944 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkBitmap.h b/core/SkBitmap.h
index 887169c..d7f4327 100644
--- a/core/SkBitmap.h
+++ b/core/SkBitmap.h
@@ -538,7 +538,7 @@
by calling copyTo().
*/
bool canCopyTo(Config newConfig) const;
-
+
/**
* DEPRECATED -- will be replaced with API on SkPaint
*/
@@ -702,6 +702,18 @@
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.
+ */
+
+ void scale(SkBitmap *dst) const;
friend struct SkBitmapProcState;
};
diff --git a/core/SkPaint.h b/core/SkPaint.h
index 9785213..2d7b3fa 100644
--- a/core/SkPaint.h
+++ b/core/SkPaint.h
@@ -43,11 +43,14 @@
typedef const SkGlyph& (*SkMeasureCacheProc)(SkGlyphCache*, const char**);
+#define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag
+
/** \class SkPaint
The SkPaint class holds the style and color information about how to draw
geometries, text and bitmaps.
*/
+
class SK_API SkPaint {
public:
SkPaint();
@@ -108,7 +111,7 @@
kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter
kVerticalText_Flag = 0x1000,
kGenA8FromLCD_Flag = 0x2000, // hack for GDI -- do not use if you can help it
- kBicubicFilterBitmap_Flag = 0x4000, // temporary flag
+ kHighQualityFilterBitmap_Flag = 0x4000, // temporary flag
kHighQualityDownsampleBitmap_Flag = 0x8000, // temporary flag
// when adding extra flags, note that the fFlags member is specified
