Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d8779fc authored Oct 16, 2013 by Michael Wright

Disable unused parameter warning for libinput

Also, avoid comparing values of mixed signedness.

Change-Id: I9804f69c29fcb1d0a9fe4b833ef1a569738c99fd

parent 805f7a1d

services/input/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,8 @@ LOCAL_SHARED_LIBRARIES := \
	LOCAL_C_INCLUDES := \		LOCAL_C_INCLUDES := \
	external/skia/include/core		external/skia/include/core

			LOCAL_CFLAGS += -Wno-unused-parameter

	LOCAL_MODULE:= libinputservice		LOCAL_MODULE:= libinputservice

	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

services/input/SpriteController.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -216,12 +216,12 @@ void SpriteController::doUpdateSprites() {
	paint.setXfermodeMode(SkXfermode::kSrc_Mode);		paint.setXfermodeMode(SkXfermode::kSrc_Mode);
	surfaceCanvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint);		surfaceCanvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint);

	if (outBuffer.width > uint32_t(update.state.icon.bitmap.width())) {		if (outBuffer.width > update.state.icon.bitmap.width()) {
	paint.setColor(0); // transparent fill color		paint.setColor(0); // transparent fill color
	surfaceCanvas.drawRectCoords(update.state.icon.bitmap.width(), 0,		surfaceCanvas.drawRectCoords(update.state.icon.bitmap.width(), 0,
	outBuffer.width, update.state.icon.bitmap.height(), paint);		outBuffer.width, update.state.icon.bitmap.height(), paint);
	}		}
	if (outBuffer.height > uint32_t(update.state.icon.bitmap.height())) {		if (outBuffer.height > update.state.icon.bitmap.height()) {
	paint.setColor(0); // transparent fill color		paint.setColor(0); // transparent fill color
	surfaceCanvas.drawRectCoords(0, update.state.icon.bitmap.height(),		surfaceCanvas.drawRectCoords(0, update.state.icon.bitmap.height(),
	outBuffer.width, outBuffer.height, paint);		outBuffer.width, outBuffer.height, paint);