Merge "Remove unused bitsPerPixel" (81a94b91) · Commits · e / os / android_frameworks_native

libs/ui/PixelFormat.cpp

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -39,25 +39,6 @@ uint32_t bytesPerPixel(PixelFormat format) {
	return 0;		return 0;
	}		}

	uint32_t bitsPerPixel(PixelFormat format) {
	switch (format) {
	case PIXEL_FORMAT_RGBA_FP16:
	return 64;
	case PIXEL_FORMAT_RGBA_8888:
	case PIXEL_FORMAT_RGBX_8888:
	case PIXEL_FORMAT_BGRA_8888:
	case PIXEL_FORMAT_RGBA_1010102:
	return 32;
	case PIXEL_FORMAT_RGB_888:
	return 24;
	case PIXEL_FORMAT_RGB_565:
	case PIXEL_FORMAT_RGBA_5551:
	case PIXEL_FORMAT_RGBA_4444:
	return 16;
	}
	return 0;
	}

	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------
	}; // namespace android		}; // namespace android
	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,6 @@ enum {
	typedef int32_t PixelFormat;		typedef int32_t PixelFormat;

	uint32_t bytesPerPixel(PixelFormat format);		uint32_t bytesPerPixel(PixelFormat format);
	uint32_t bitsPerPixel(PixelFormat format);

	}; // namespace android		}; // namespace android