Re: [PATCH RESEND 1/4] xkb: init mapWidth and symsPerKey arrays to 0.

2010-10-14 Thread Mikhail Gusarov
Twas brillig at 12:02:56 15.10.2010 UTC+10 when peter.hutte...@who-t.net did gyre and gimble: PH> -CARD16 symsPerKey[XkbMaxLegalKeyCode + 1]; PH> +CARD8 mapWidths[XkbMaxLegalKeyCode + 1] = {0}; Just a syntax nit - why not = {}? -- http://fossarchy.blogsp

[PATCH] dix: update comments for GetPointerEvents and friends

2010-10-14 Thread Peter Hutterer
All these now generate InternalEvents, point this out. Remove XKB/XI references, that's just confusing. This comment referred to the old-style event generation code from server 1.4 to including 1.6 but is now just confusing to newcomers. Remove comment about SwitchCoreKeyboard() for the same reaso

[PATCH RESEND 4/4] mi: handle DGA subtypes when determining the master device.

2010-10-14 Thread Peter Hutterer
The subtype in the DGA event is the core type and all ET_ event types (where applicable) are identical to the core types. Thus the switch statement below will work as required and assign the right master device. Fixes a crasher bug on keyboard devices with valuators. If a device sends a motion eve

[PATCH RESEND 3/4] xfree86: set mask for valuators 0/1 when emulating core events (#30267)

2010-10-14 Thread Peter Hutterer
EventToCore as of the commit below won't generate core motion events if the valuator mask for x/y isn't set. For DGA, we work around this check by forcibly setting the mask in the event we pass down. commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 Author: Peter Hutterer Date: Tue Aug 17 12:08:5

[PATCH RESEND 2/4] xkb: always fill the symsPerKey array, regardless of client flags (#30527)

2010-10-14 Thread Peter Hutterer
Even if a client does not modify the symbols, symsPerKey and mapWidths must be filled from the current configuration. Both arrays are then passed into other functions (pending the right flag), thus they must contain valid values regardless of the XkbKeySymsMask flag in req->present. X.Org Bug 3052

[PATCH RESEND 1/4] xkb: init mapWidth and symsPerKey arrays to 0.

2010-10-14 Thread Peter Hutterer
Helps debugging greatly, random 8 or 16 bit values can sometimes look like valid values, causing much excitement on the client front. Signed-off-by: Peter Hutterer --- xkb/xkb.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xkb/xkb.c b/xkb/xkb.c index 4105c1c..7d95b

Re: [PATCH] DRI2: Fix memory leak when a screen is not DRI2 capable.

2010-10-14 Thread Ian Romanick
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Kusanagi Kouichi wrote: > Signed-off-by: Kusanagi Kouichi Looks good. Reviewed-by: Ian Romanick > --- > glx/glxdri2.c | 13 +++-- > 1 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/glx/glxdri2.c b/glx/glxdri2.c > index

Re: [PATCH 2/5] config: Remove atimisc workaround

2010-10-14 Thread Mark Kettenis
> From: Adam Jackson > Date: Thu, 14 Oct 2010 15:13:25 -0400 > > Signed-off-by: Adam Jackson > --- > hw/xfree86/common/xf86Config.c | 18 -- > 1 files changed, 0 insertions(+), 18 deletions(-) Reviewed-by: Mark Kettenis > diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfr

Re: [PATCH 3/5] xfree86: Remove an open-coded strtoul()

2010-10-14 Thread Dan Nicholson
On Thu, Oct 14, 2010 at 12:13 PM, Adam Jackson wrote: > Signed-off-by: Adam Jackson Reviewed-by: Dan Nicholson ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xor

Re: [PATCH 4/5] xfree86: Remove %M expansion from config parser

2010-10-14 Thread Dan Nicholson
On Thu, Oct 14, 2010 at 12:13 PM, Adam Jackson wrote: > This was to distinguish XFree86 3.x files from XFree86 4.x files.  It > never really made sense to be looking for xorg.conf-4. > > Signed-off-by: Adam Jackson Reviewed-by: Dan Nicholson ___ xorg-

Re: [PATCH 1/5] config: Don't look for .o drivers anymore

2010-10-14 Thread Matt Turner
On Thu, Oct 14, 2010 at 3:13 PM, Adam Jackson wrote: > This hasn't worked since we switched to dlloader. > > Signed-off-by: Adam Jackson > --- >  hw/xfree86/common/xf86Config.c |    2 +- >  1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree

Re: [PATCH 1/3] xfree86: drop linux libc5 support from the SIGIO code

2010-10-14 Thread Matt Turner
On Thu, Oct 14, 2010 at 12:49 PM, Adam Jackson wrote: > Signed-off-by: Adam Jackson > --- >  hw/xfree86/os-support/shared/sigio.c |    9 - >  1 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/hw/xfree86/os-support/shared/sigio.c > b/hw/xfree86/os-support/shared/sigio.c >

Re: [PATCH 10/18] Add multi-touch support

2010-10-14 Thread Henrik Rydberg
On 10/14/2010 08:52 PM, Dmitry Torokhov wrote: > On Thursday, October 14, 2010 11:19:37 am Henrik Rydberg wrote: >> On 10/14/2010 06:54 AM, Peter Hutterer wrote: >> [...] >> >>> oh, I didn't know this. that should go into a comment and the commit >>> message then. Though a few touchpads support up

Re: [PATCH 10/18] Add multi-touch support

2010-10-14 Thread Dmitry Torokhov
On Thursday, October 14, 2010 11:19:37 am Henrik Rydberg wrote: > On 10/14/2010 06:54 AM, Peter Hutterer wrote: > [...] > > > oh, I didn't know this. that should go into a comment and the commit > > message then. Though a few touchpads support up to 4 fingers, isn't it > > (Henrik, what about the

Re: [PATCH 1/2] kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599

2010-10-14 Thread Julien Cristau
On Thu, Oct 14, 2010 at 15:49:50 +0200, Michał Górny wrote: > If pkg-config is unable to find tslib but the fallback check does find > it, the compilation continues with tslib support enabled though > TSLIB_LIBS are unset. Thus, the compilation fails with a linking error > on tslib functions. > >

Re: [PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Tiago Vignatti
On Thu, Oct 14, 2010 at 09:29:33PM +0200, ext Aaron Plattner wrote: > On Thu, Oct 14, 2010 at 12:19:49PM -0700, Adam Jackson wrote: > > On Thu, 2010-10-14 at 12:12 -0700, Aaron Plattner wrote: > > > On Thu, Oct 14, 2010 at 09:49:05AM -0700, Adam Jackson wrote: > > > > Signed-off-by: Adam Jackson >

Re: [PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Aaron Plattner
On Thu, Oct 14, 2010 at 12:19:49PM -0700, Adam Jackson wrote: > On Thu, 2010-10-14 at 12:12 -0700, Aaron Plattner wrote: > > On Thu, Oct 14, 2010 at 09:49:05AM -0700, Adam Jackson wrote: > > > Signed-off-by: Adam Jackson > > > --- > > > hw/xfree86/os-support/shared/sigio.c | 11 ---

Re: [PATCH 3/3] xfree86: Add a conservative SIGIO handler path

2010-10-14 Thread Tiago Vignatti
On Thu, Oct 14, 2010 at 06:49:06PM +0200, ext Adam Jackson wrote: > Instead of actually processing input in the handler, the conservative > path just raises enough of a dispatch exception to bomb out of request > processing and handle input instead. ajax, I understand the rationale but would be gr

Re: ABI breakage

2010-10-14 Thread Thomas Hellstrom
On 10/14/2010 09:08 PM, Aaron Plattner wrote: On Thu, Oct 14, 2010 at 12:00:40PM -0700, Thomas Hellstrom wrote: On 10/14/2010 06:11 PM, Thomas Hellstrom wrote: Hi! Isn't the commit 5c6a2f93ebc16a78093782b442306de23ae94e78 xfree86: Kill pixmapPrivate with a vengeance (v2) a major A

Re: [PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Adam Jackson
On Thu, 2010-10-14 at 12:12 -0700, Aaron Plattner wrote: > On Thu, Oct 14, 2010 at 09:49:05AM -0700, Adam Jackson wrote: > > Signed-off-by: Adam Jackson > > --- > > hw/xfree86/os-support/shared/sigio.c | 11 --- > > hw/xfree86/os-support/shared/sigiostubs.c |5 - > > hw/xfr

Question about signature computation performance

2010-10-14 Thread Brett Ciphery
I'm wondering if someone can comment on the performance loss for the below patch and whether it is significant enough to warrant a full signature computation/hashing algorithm rewrite. The below was patched to libX11-1.1.3 to fix an issue with the keysym-tables ks_tables.h in a cross compile envir

[PATCH 5/5] dri1: Remove "buffers" from the config logic

2010-10-14 Thread Adam Jackson
This was only ever used from the glint driver, which has since lost its DRI support. Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86Config.c | 22 -- hw/xfree86/parser/DRI.c| 64 hw/xfree86/parser/xf86Parser.h | 11 ---

[PATCH 4/5] xfree86: Remove %M expansion from config parser

2010-10-14 Thread Adam Jackson
This was to distinguish XFree86 3.x files from XFree86 4.x files. It never really made sense to be looking for xorg.conf-4. Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86Config.c | 12 ++-- hw/xfree86/doc/man/xorg.conf.man.pre |6 -- hw/xfree86/parser/scan.c

[PATCH 3/5] xfree86: Remove an open-coded strtoul()

2010-10-14 Thread Adam Jackson
Signed-off-by: Adam Jackson --- hw/xfree86/parser/scan.c | 49 +- 1 files changed, 1 insertions(+), 48 deletions(-) diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index e609bdf..97cd79c 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw

[PATCH 2/5] config: Remove atimisc workaround

2010-10-14 Thread Adam Jackson
Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86Config.c | 18 -- 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 15ff750..a63f487 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfr

[PATCH 1/5] config: Don't look for .o drivers anymore

2010-10-14 Thread Adam Jackson
This hasn't worked since we switched to dlloader. Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86Config.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 6743b10..15ff750 100644 --- a/hw/xfree8

Re: [PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Aaron Plattner
On Thu, Oct 14, 2010 at 09:49:05AM -0700, Adam Jackson wrote: > Signed-off-by: Adam Jackson > --- > hw/xfree86/os-support/shared/sigio.c | 11 --- > hw/xfree86/os-support/shared/sigiostubs.c |5 - > hw/xfree86/os-support/xf86_OSproc.h |1 - > 3 files changed, 0 in

[PATCH] fix a sign problem with valuator data.

2010-10-14 Thread Joe Shaw
From: Joe Shaw Without this patch, any negative valuator value is wrong when returned from XQueryDeviceState(). This is a regression from at least xserver 1.4. Valuator data is set in dix/getevents.c:set_valuators() by copying signed int values into an unsigned int field DeviceEvent.valuators.d

[PATCH xserver] fix a sign problem with valuator data.

2010-10-14 Thread Joe Shaw
Hi, Here is a patch to fix problems with negative valuator values and XQueryDeviceState(). Without this, joysticks and other devices always return -2^31 with negative valuator values. If changing DeviceEvent.valuators.data to a signed integer is undesirable, another workable (but IMO grosser) fi

Re: ABI breakage

2010-10-14 Thread Aaron Plattner
On Thu, Oct 14, 2010 at 12:00:40PM -0700, Thomas Hellstrom wrote: > > On 10/14/2010 06:11 PM, Thomas Hellstrom wrote: > > Hi! > > > > Isn't the commit > > > > 5c6a2f93ebc16a78093782b442306de23ae94e78 > > xfree86: Kill pixmapPrivate with a vengeance (v2) > > > > a major ABI breakage (It alters the

Re: [PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Tiago Vignatti
On Thu, Oct 14, 2010 at 06:49:05PM +0200, ext Adam Jackson wrote: > Signed-off-by: Adam Jackson > --- > hw/xfree86/os-support/shared/sigio.c | 11 --- > hw/xfree86/os-support/shared/sigiostubs.c |5 - > hw/xfree86/os-support/xf86_OSproc.h |1 - > 3 files changed,

Re: ABI breakage

2010-10-14 Thread Thomas Hellstrom
On 10/14/2010 06:11 PM, Thomas Hellstrom wrote: Hi! Isn't the commit 5c6a2f93ebc16a78093782b442306de23ae94e78 xfree86: Kill pixmapPrivate with a vengeance (v2) a major ABI breakage (It alters the layout of the ScreenInfoRec structure and also there are drivers hacking the pixmatPrivate membe

Re: [PATCH 3/3] xfree86: Add a conservative SIGIO handler path

2010-10-14 Thread Mikhail Gusarov
Twas brillig at 12:49:06 14.10.2010 UTC-04 when a...@redhat.com did gyre and gimble: AJ> Instead of actually processing input in the handler, the conservative AJ> path just raises enough of a dispatch exception to bomb out of request AJ> processing and handle input instead. AJ> Signed-off-b

Re: [PATCH 1/3] xfree86: drop linux libc5 support from the SIGIO code

2010-10-14 Thread Tiago Vignatti
On Thu, Oct 14, 2010 at 06:49:04PM +0200, ext Adam Jackson wrote: > Signed-off-by: Adam Jackson > --- > hw/xfree86/os-support/shared/sigio.c |9 - > 1 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/hw/xfree86/os-support/shared/sigio.c > b/hw/xfree86/os-support/share

Re: [PATCH xserver] Convert server to masked input valuators

2010-10-14 Thread Chase Douglas
On Thu, 2010-10-14 at 13:31 +1000, Peter Hutterer wrote: > On Tue, Oct 05, 2010 at 04:07:56PM -0400, Chase Douglas wrote: > > XI2 allows for input event valuators to be masked. The current input > > module API only allows for ranges to be specified. This fixes all > > internal plumbing to use masks

Re: [PATCH 10/18] Add multi-touch support

2010-10-14 Thread Henrik Rydberg
On 10/14/2010 06:54 AM, Peter Hutterer wrote: [...] > oh, I didn't know this. that should go into a comment and the commit message > then. Though a few touchpads support up to 4 fingers, isn't it (Henrik, > what about the apple touchpads?) > and either way, keeping it generic from the start saves

Re: [PATCH 0/3] SIGIO cleanups and alternate processing path

2010-10-14 Thread Alan Coopersmith
Adam Jackson wrote: > For those who want prompt-ish input handling but don't trust the safety of > the code called from the SIGIO path. Acked-by: Alan Coopersmith -- -Alan Coopersmith-alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System

[PATCH 3/3] xfree86: Add a conservative SIGIO handler path

2010-10-14 Thread Adam Jackson
Instead of actually processing input in the handler, the conservative path just raises enough of a dispatch exception to bomb out of request processing and handle input instead. Signed-off-by: Adam Jackson --- configure.ac |3 +++ hw/xfree86/common/xf86Events.c | 34 +

[PATCH 1/3] xfree86: drop linux libc5 support from the SIGIO code

2010-10-14 Thread Adam Jackson
Signed-off-by: Adam Jackson --- hw/xfree86/os-support/shared/sigio.c |9 - 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index aed5654..274a8ab 100644 --- a/hw/xfree86/os-support/shared/sigio

[PATCH 2/3] xfree86: Remove unused xf86AssertBlockedSIGIO

2010-10-14 Thread Adam Jackson
Signed-off-by: Adam Jackson --- hw/xfree86/os-support/shared/sigio.c | 11 --- hw/xfree86/os-support/shared/sigiostubs.c |5 - hw/xfree86/os-support/xf86_OSproc.h |1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/hw/xfree86/os-support/shared/si

[PATCH 0/3] SIGIO cleanups and alternate processing path

2010-10-14 Thread Adam Jackson
For those who want prompt-ish input handling but don't trust the safety of the code called from the SIGIO path. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listin

Re: [PATCH 12/18] Add pinch gesture support

2010-10-14 Thread Chris Bagwell
On Fri, Oct 8, 2010 at 12:22 PM, Takashi Iwai wrote: > + static void > +handle_multi_touch_pinch(SynapticsPrivate *priv, struct SynapticsHwState *hw, > +                        int *zoom_in, int *zoom_out) > +{ > +    SynapticsParameters *para = &priv->synpara; > +    int width = abs(priv->maxx -

ABI breakage

2010-10-14 Thread Thomas Hellstrom
Hi! Isn't the commit 5c6a2f93ebc16a78093782b442306de23ae94e78 xfree86: Kill pixmapPrivate with a vengeance (v2) a major ABI breakage (It alters the layout of the ScreenInfoRec structure and also there are drivers hacking the pixmatPrivate member to workaround the problem of the root pixmap's

Re: libx11 crash (possible PATCH attached)

2010-10-14 Thread Peter Clifton
On Thu, 2010-10-14 at 18:01 +0300, Rami Ylimäki wrote: > Hi, > > Sounds a lot like an already fixed problem: > http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=4b8ff7db39f2fe7ef12968d462aaf3f9054b6c18. > > -- Rami Looks like indeed. I should have checked git HEAD. Thanks for the pointer.

Re: libx11 crash (possible PATCH attached)

2010-10-14 Thread Rami Ylimäki
Hi, Sounds a lot like an already fixed problem: http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=4b8ff7db39f2fe7ef12968d462aaf3f9054b6c18. -- Rami On 10/14/2010 04:30 PM, Peter Clifton wrote: Hi, I ran across a repeatable crash in libx11 when dealing with some broken OpenGL code I wa

Re: A question about the gtf setting

2010-10-14 Thread Alex Deucher
On Thu, Oct 14, 2010 at 4:14 AM, Huang, FrankR wrote: > Alex, > > Appreciate your sooner reply in detail. And you must have read my mail > between xorg-devel guys and I. Thanks also for your care on geode thing. You > show me a very good example of ATI *_mode_valid() to refer. See below for my

[PATCH 2/2] kdrive: Fix linking with tslib, with -Wl, --as-needed. #30600

2010-10-14 Thread Michał Górny
Change the library order in TSLIB_LIBS variable, placing ${TSLIB_LIBS} after the local static libraries. This fixes linking with -Wl,--as-needed. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30600 Signed-off-by: Michał Górny --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1

[PATCH 1/2] kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599

2010-10-14 Thread Michał Górny
If pkg-config is unable to find tslib but the fallback check does find it, the compilation continues with tslib support enabled though TSLIB_LIBS are unset. Thus, the compilation fails with a linking error on tslib functions. This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check s

Re: [PATCH 10/18] Add multi-touch support

2010-10-14 Thread Chris Bagwell
On Wed, Oct 13, 2010 at 1:12 AM, Takashi Iwai wrote: > At Wed, 13 Oct 2010 14:25:16 +1000, > Peter Hutterer wrote: >> >> On Fri, Oct 08, 2010 at 07:22:34PM +0200, Takashi Iwai wrote: >> >> > +    if (priv->model != MODEL_SYNAPTICS) >> > +   return; >> > +    SYSCALL(rc = ioctl(local->fd, EVIOCGBIT

libx11 crash (possible PATCH attached)

2010-10-14 Thread Peter Clifton
Hi, I ran across a repeatable crash in libx11 when dealing with some broken OpenGL code I was writing. Unfortunately, I've forgotten how to repeat the crash (as it was related to some obscure buggy scenario in my GL setup). What I did note was the location / cause, and a patch which got me past t

Re: Mixed pixmap creation

2010-10-14 Thread Jonathan Morton
On Thu, 2010-10-14 at 17:07 +0800, fancy fang wrote: > However, I wonder why Unit Pixmap needs a system buffer and the system > buffer is malloced in exaCreatePixmap_mixed instead of other places, > such as exaDoPrepareAccess_mixed. Sometimes an operation involving a solid colour can be optimised

Re: Mixed pixmap creation

2010-10-14 Thread fancy fang
Great! I almost understand what you mean. However, I wonder why Unit Pixmap needs a system buffer and the system buffer is malloced in exaCreatePixmap_mixed instead of other places, such as exaDoPrepareAccess_mixed. Thanks! FancyFang 2010/10/14 Jonathan Morton > On Thu, 2010-10-14 at 16:43 +080

Re: Mixed pixmap creation

2010-10-14 Thread Jonathan Morton
On Thu, 2010-10-14 at 16:43 +0800, fancy fang wrote: > Thanks! But, I still can not understand why Unit Pixmap needs both > system buffer and driver buffer? In my opinion, Unit Pixmap only needs > system buffer. Welcome your opinions! Because the driver needs to see the colour of this pixel, if i

Re: Mixed pixmap creation

2010-10-14 Thread fancy fang
Thanks! But, I still can not understand why Unit Pixmap needs both system buffer and driver buffer? In my opinion, Unit Pixmap only needs system buffer. Welcome your opinions! Fancy Fang 2010/10/14 Jonathan Morton > On Thu, 2010-10-14 at 16:18 +0800, fancy fang wrote: > > In exaCreatePixmap_mi

Re: Mixed pixmap creation

2010-10-14 Thread Jonathan Morton
On Thu, 2010-10-14 at 16:18 +0800, fancy fang wrote: > In exaCreatePixmap_mixed from Xserver 1.9.0, when w == 1 && h == 1, it > will malloc pixmap data immediately. Please let me name this kind of > pixmap as Unit Pixmap. First, I don't know what the benifit is. > Second, when the exaDoMigration_mi

Mixed pixmap creation

2010-10-14 Thread fancy fang
Dear all, In exaCreatePixmap_mixed from Xserver 1.9.0, when w == 1 && h == 1, it will malloc pixmap data immediately. Please let me name this kind of pixmap as Unit Pixmap. First, I don't know what the benifit is. Second, when the exaDoMigration_mixed is executed, it will allocate driver

RE: A question about the gtf setting

2010-10-14 Thread Huang, FrankR
Alex, Appreciate your sooner reply in detail. And you must have read my mail between xorg-devel guys and I. Thanks also for your care on geode thing. You show me a very good example of ATI *_mode_valid() to refer. See below for my question: > For flat panels, you may want to use cvt rather than