remove dst/rendertarget support for kARGB_4444_Config
BUG=
Review URL: https://codereview.chromium.org/17335008
git-svn-id: http://skia.googlecode.com/svn/trunk@9727 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ARGBImageEncoderTest.cpp b/tests/ARGBImageEncoderTest.cpp
index 05ad58c..9f68a0a 100644
--- a/tests/ARGBImageEncoderTest.cpp
+++ b/tests/ARGBImageEncoderTest.cpp
@@ -25,7 +25,6 @@
static SkBitmap::Config configs[] = {
SkBitmap::kRGB_565_Config,
- SkBitmap::kARGB_4444_Config,
SkBitmap::kARGB_8888_Config,
};
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 6cfb24b..4058b04 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -242,11 +242,11 @@
static const Pair gPairs[] = {
{ SkBitmap::kNo_Config, "00000000" },
{ SkBitmap::kA1_Config, "01000000" },
- { SkBitmap::kA8_Config, "00101110" },
- { SkBitmap::kIndex8_Config, "00111110" },
- { SkBitmap::kRGB_565_Config, "00101110" },
+ { SkBitmap::kA8_Config, "00101010" },
+ { SkBitmap::kIndex8_Config, "00111010" },
+ { SkBitmap::kRGB_565_Config, "00101010" },
{ SkBitmap::kARGB_4444_Config, "00101110" },
- { SkBitmap::kARGB_8888_Config, "00101110" },
+ { SkBitmap::kARGB_8888_Config, "00101010" },
// TODO: create valid RLE bitmap to test with
// { SkBitmap::kRLE_Index8_Config, "00101111" }
};
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 4204ddf..8ada98c 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -18,8 +18,6 @@
// unpremultiply aspect of getColor()
{ SkBitmap::kA8_Config, 0xFF000000, 0xFF000000 },
{ SkBitmap::kA8_Config, 0, 0 },
- { SkBitmap::kARGB_4444_Config, 0xFF224466, 0xFF224466 },
- { SkBitmap::kARGB_4444_Config, 0, 0 },
{ SkBitmap::kRGB_565_Config, 0xFF00FF00, 0xFF00FF00 },
{ SkBitmap::kRGB_565_Config, 0xFFFF00FF, 0xFFFF00FF },
{ SkBitmap::kARGB_8888_Config, 0xFFFFFFFF, 0xFFFFFFFF },
diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp
index 04de707..924cea2 100644
--- a/tests/BitmapHasherTest.cpp
+++ b/tests/BitmapHasherTest.cpp
@@ -51,10 +51,6 @@
CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN);
REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
REPORTER_ASSERT(fReporter, digest == 0x2423c51cad6d1edcULL);
- // same pixel colors in a different config should yield the same checksum
- CreateTestBitmap(bitmap, SkBitmap::kARGB_4444_Config, 555, 333, SK_ColorGREEN);
- REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
- REPORTER_ASSERT(fReporter, digest == 0x2423c51cad6d1edcULL);
}
Reporter* fReporter;
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index 22141e5..a800fb1 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -25,7 +25,7 @@
// these are in the same order as the SkBitmap::Config enum
static const char* gConfigName[] = {
- "None", "4444", "8888"
+ "None", "8888"
};
struct Pair {
@@ -119,7 +119,6 @@
}
static const Pair gPairs[] = {
{ SkBitmap::kNo_Config, "000" },
- { SkBitmap::kARGB_4444_Config, "011" },
{ SkBitmap::kARGB_8888_Config, "011" },
};