Hi,
Another little patch..

There is no need to call xf86WcmMappingFactor before xf86WcmInitialCoordinates 
because xf86WcmInitialCoordinates calls it anyway.

--
Przemo
>From b25dfd916d11006a22e54c8652e63a6d385e45a2 Mon Sep 17 00:00:00 2001
From: Przemo Firszt <[email protected]>
Date: Thu, 17 Dec 2009 20:24:38 +0000
Subject: [PATCH] Remove redundant xf86WcmMappingFactor calls

No need to call xf86WcmMappingFactor before xf86WcmInitialCoordinates because
xf86WcmInitialCoordinates calls it anyway.
Signed-off-by: Przemo Firszt <[email protected]>
---
 src/wcmCommon.c   |    1 -
 src/wcmXCommand.c |    3 ---
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index c5c4a57..7737bf0 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1882,7 +1882,6 @@ static void rotateOneTool(WacomDevicePtr priv)
 		area->bottomY = priv->bottomY = oldMaxY - tmpTopY;
 		break;
 	}
-	xf86WcmMappingFactor(priv->local);
 	xf86WcmInitialCoordinates(priv->local, 0);
 	xf86WcmInitialCoordinates(priv->local, 1);
 
diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
index 563a42d..698c280 100644
--- a/src/wcmXCommand.c
+++ b/src/wcmXCommand.c
@@ -84,7 +84,6 @@ int xf86WcmDevSwitchModeCall(LocalDevicePtr local, int mode)
 	{
 		priv->flags |= ABSOLUTE_FLAG;
 		xf86ReplaceStrOption(local->options, "Mode", "Absolute");
-		xf86WcmMappingFactor(local);
 		xf86WcmInitialCoordinates(local, 0);
 		xf86WcmInitialCoordinates(local, 1);
 	}
@@ -92,7 +91,6 @@ int xf86WcmDevSwitchModeCall(LocalDevicePtr local, int mode)
 	{
 		priv->flags &= ~ABSOLUTE_FLAG; 
 		xf86ReplaceStrOption(local->options, "Mode", "Relative");
-		xf86WcmMappingFactor(local);
 		xf86WcmInitialCoordinates(local, 0);
 		xf86WcmInitialCoordinates(local, 1);
 	}
@@ -345,7 +343,6 @@ int xf86WcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
             priv->topY = values[1];
             priv->bottomX = values[2];
             priv->bottomY = values[3];
-            xf86WcmMappingFactor(local);
             xf86WcmInitialCoordinates(local, 0);
             xf86WcmInitialCoordinates(local, 1);
         }
-- 
1.6.5.2

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to