summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-07-25 17:25:02 -0700
committerMathias Agopian <mathias@google.com>2013-07-25 17:25:02 -0700
commit6f7b58917104916ee6afd6f246c251c1d7a2102a (patch)
treee891b7ff6e9e0b591ecd8a9bbf0619dbf759d9cd
parent3de52c67e5fa0f2cc8ddfb4d0ab4f206274e0054 (diff)
downloadframeworks_base-6f7b58917104916ee6afd6f246c251c1d7a2102a.zip
frameworks_base-6f7b58917104916ee6afd6f246c251c1d7a2102a.tar.gz
frameworks_base-6f7b58917104916ee6afd6f246c251c1d7a2102a.tar.bz2
get rid of PIXEL_FORMAT_A_8
Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
-rw-r--r--cmds/screencap/screencap.cpp2
-rw-r--r--core/jni/android_view_Surface.cpp1
-rw-r--r--core/jni/android_view_SurfaceControl.cpp1
-rw-r--r--core/jni/com_google_android_gles_jni_EGLImpl.cpp1
4 files changed, 0 insertions, 5 deletions
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index be32355..921a175 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -55,8 +55,6 @@ static void usage(const char* pname)
static SkBitmap::Config flinger2skia(PixelFormat f)
{
switch (f) {
- case PIXEL_FORMAT_A_8:
- return SkBitmap::kA8_Config;
case PIXEL_FORMAT_RGB_565:
return SkBitmap::kRGB_565_Config;
case PIXEL_FORMAT_RGBA_4444:
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index bf6753d..7e40d46 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -185,7 +185,6 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) {
case PIXEL_FORMAT_RGBA_8888: return SkBitmap::kARGB_8888_Config;
case PIXEL_FORMAT_RGBA_4444: return SkBitmap::kARGB_4444_Config;
case PIXEL_FORMAT_RGB_565: return SkBitmap::kRGB_565_Config;
- case PIXEL_FORMAT_A_8: return SkBitmap::kA8_Config;
default: return SkBitmap::kNo_Config;
}
}
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index ec10536..daf1aca 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -157,7 +157,6 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) {
case PIXEL_FORMAT_RGBA_8888: return SkBitmap::kARGB_8888_Config;
case PIXEL_FORMAT_RGBA_4444: return SkBitmap::kARGB_4444_Config;
case PIXEL_FORMAT_RGB_565: return SkBitmap::kRGB_565_Config;
- case PIXEL_FORMAT_A_8: return SkBitmap::kA8_Config;
default: return SkBitmap::kNo_Config;
}
}
diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
index 37330ec..b0c73a2 100644
--- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
@@ -258,7 +258,6 @@ static PixelFormat convertPixelFormat(SkBitmap::Config format)
case SkBitmap::kARGB_8888_Config: return PIXEL_FORMAT_RGBA_8888;
case SkBitmap::kARGB_4444_Config: return PIXEL_FORMAT_RGBA_4444;
case SkBitmap::kRGB_565_Config: return PIXEL_FORMAT_RGB_565;
- case SkBitmap::kA8_Config: return PIXEL_FORMAT_A_8;
default: return PIXEL_FORMAT_NONE;
}
}