From 84edfc7970a0bc828ba38295d88ee6e2a4dabbce Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 7 Sep 2010 21:26:53 +0200 Subject: added com.jogamp.util.CLInfo. introduced CLProperty annotation for CLDevice and CLPlatform properties. fixed bug in CLVersion. --- src/com/jogamp/opencl/CLVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/com/jogamp/opencl/CLVersion.java') diff --git a/src/com/jogamp/opencl/CLVersion.java b/src/com/jogamp/opencl/CLVersion.java index e8a7e79c..82ee6466 100644 --- a/src/com/jogamp/opencl/CLVersion.java +++ b/src/com/jogamp/opencl/CLVersion.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; */ public class CLVersion implements Comparable { - private final static Pattern pattern = Pattern.compile("OpenCL (\\d+)\\.(\\d+)(.*)"); + private final static Pattern pattern = Pattern.compile("OpenCL (?:C )?(\\d+)\\.(\\d+)(.*)"); public final static CLVersion CL_1_0 = new CLVersion("OpenCL 1.0"); public final static CLVersion CL_1_1 = new CLVersion("OpenCL 1.1"); @@ -134,7 +134,7 @@ public class CLVersion implements Comparable { */ @Override public boolean equals(Object obj) { - return obj != null && fullversion.equals(obj); + return obj != null && obj.getClass() == getClass() && fullversion.equals(((CLVersion)obj).fullversion); } -- cgit v1.2.3