diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-06-21 09:34:55 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-06-23 13:56:20 -0700 |
| commit | c7ac485a59709572307b9a4a9abacc52c7021b65 (patch) | |
| tree | 979dbc66d9dc1bab11bd044bd9475a81c2f98df3 | |
| parent | 2cf1f39ca974c81a2f52d2f7509aa3d098a87176 (diff) | |
Remove the default case from fbcompose.c switches which should cover all cases.
Instead, stick the NULL return default case afterwards, so that the compiler can
warn us when we've got unimplemented cases. Removes some unimplemented and
unused 8bpp, depth 4 picture format names.
| -rw-r--r-- | fb/fbcompose.c | 8 | ||||
| -rw-r--r-- | render/picture.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 03adab456..3a61e975a 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -573,9 +573,9 @@ static fetchProc fetchProcForPicture (PicturePtr pict) /* 1bpp formats */ case PICT_a1: return fbFetch_a1; case PICT_g1: return fbFetch_g1; - default: - return NULL; } + + return NULL; } /* @@ -1010,9 +1010,9 @@ static fetchPixelProc fetchPixelProcForPicture (PicturePtr pict) /* 1bpp formats */ case PICT_a1: return fbFetchPixel_a1; case PICT_g1: return fbFetchPixel_g1; - default: - return NULL; } + + return NULL; } diff --git a/render/picture.h b/render/picture.h index e7d86ac39..8184c02c0 100644 --- a/render/picture.h +++ b/render/picture.h @@ -102,10 +102,6 @@ typedef enum _PictFormatShort { PICT_g8 = PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0), PICT_x4a4 = PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0), - PICT_x4r1g2b1 = PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1), - PICT_x4b1g2r1 = PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1), - PICT_x4a1r1g1b1 = PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1), - PICT_x4a1b1g1r1 = PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1), PICT_x4c4 = PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0), PICT_x4g4 = PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0), |