From 1f3e8116ed3b18e1fbcf4382c3c5e40c825603ba Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 28 Jun 2011 23:20:16 +0200 Subject: Fix copyright/author tags --- src/com/jogamp/opencl/CLBuffer.java | 4 +-- src/com/jogamp/opencl/CLCommandQueue.java | 4 +-- src/com/jogamp/opencl/CLContext.java | 4 +-- src/com/jogamp/opencl/CLEvent.java | 4 +-- src/com/jogamp/opencl/CLEventList.java | 4 +-- src/com/jogamp/opencl/CLImage.java | 2 +- src/com/jogamp/opencl/CLKernel.java | 4 +-- src/com/jogamp/opencl/CLMemory.java | 4 +-- src/com/jogamp/opencl/CLObject.java | 2 +- src/com/jogamp/opencl/CLObjectResource.java | 34 ++++++++++++++++++++-- src/com/jogamp/opencl/CLPlatform.java | 2 +- src/com/jogamp/opencl/CLProgram.java | 4 +-- src/com/jogamp/opencl/CLResource.java | 2 +- src/com/jogamp/opencl/CLSampler.java | 2 +- src/com/jogamp/opencl/JOCLJNILibLoader.java | 2 +- src/com/jogamp/opencl/gl/CLGLContext.java | 4 +-- .../jogamp/opencl/impl/CLTLAccessorFactory.java | 31 +++++++++++++++++++- src/com/jogamp/opencl/llb/impl/CLImpl.java | 4 +-- src/com/jogamp/opencl/util/CLBuildListener.java | 4 +-- 19 files changed, 89 insertions(+), 32 deletions(-) (limited to 'src/com/jogamp/opencl') diff --git a/src/com/jogamp/opencl/CLBuffer.java b/src/com/jogamp/opencl/CLBuffer.java index 99721413..873256e8 100644 --- a/src/com/jogamp/opencl/CLBuffer.java +++ b/src/com/jogamp/opencl/CLBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -42,7 +42,7 @@ import static com.jogamp.opencl.CLException.*; /** * OpenCL buffer object wrapping an optional NIO buffer. - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLBuffer extends CLMemory { diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java index eedb0bd4..2e21ca07 100644 --- a/src/com/jogamp/opencl/CLCommandQueue.java +++ b/src/com/jogamp/opencl/CLCommandQueue.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -56,7 +56,7 @@ import static com.jogamp.opencl.util.CLUtil.*; * form multiple Threads will require the application to perform appropriate synchronization. *

* @see CLDevice#createCommandQueue(com.jogamp.opencl.CLCommandQueue.Mode...) - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLCommandQueue extends CLObjectResource { diff --git a/src/com/jogamp/opencl/CLContext.java b/src/com/jogamp/opencl/CLContext.java index 7073e5d3..e3b83ae7 100644 --- a/src/com/jogamp/opencl/CLContext.java +++ b/src/com/jogamp/opencl/CLContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -79,7 +79,7 @@ import static java.util.Collections.*; * concurrency:
* CLContext is threadsafe. * - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLContext extends CLObjectResource { diff --git a/src/com/jogamp/opencl/CLEvent.java b/src/com/jogamp/opencl/CLEvent.java index d1bfeffc..7537cfdb 100644 --- a/src/com/jogamp/opencl/CLEvent.java +++ b/src/com/jogamp/opencl/CLEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -43,7 +43,7 @@ import static com.jogamp.opencl.CLException.*; * measure execution time of a command. * Profiling of OpenCL commands can be enabled by using a {@link com.jogamp.opencl.CLCommandQueue} created with * {@link com.jogamp.opencl.CLCommandQueue.Mode#PROFILING_MODE}. - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLEvent extends CLObjectResource { diff --git a/src/com/jogamp/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java index 53136e2a..f07bf0a2 100644 --- a/src/com/jogamp/opencl/CLEventList.java +++ b/src/com/jogamp/opencl/CLEventList.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -35,7 +35,7 @@ import java.util.Iterator; /** * Fixed size list for storing CLEvents. - * @author Michael Bien + * @author Michael Bien, et al. */ public final class CLEventList implements CLResource, AutoCloseable, Iterable { diff --git a/src/com/jogamp/opencl/CLImage.java b/src/com/jogamp/opencl/CLImage.java index e2daff9c..32aa30df 100644 --- a/src/com/jogamp/opencl/CLImage.java +++ b/src/com/jogamp/opencl/CLImage.java @@ -37,7 +37,7 @@ import static com.jogamp.opencl.llb.CL.*; /** * - * @author Michael Bien + * @author Michael Bien, et al. */ public abstract class CLImage extends CLMemory { diff --git a/src/com/jogamp/opencl/CLKernel.java b/src/com/jogamp/opencl/CLKernel.java index 135174c4..e54fb25a 100644 --- a/src/com/jogamp/opencl/CLKernel.java +++ b/src/com/jogamp/opencl/CLKernel.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -48,7 +48,7 @@ import static com.jogamp.common.os.Platform.*; * CLKernel is not threadsafe. * @see CLProgram#createCLKernel(java.lang.String) * @see CLProgram#createCLKernels() - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLKernel extends CLObjectResource implements Cloneable { diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java index 281d042f..c736abea 100644 --- a/src/com/jogamp/opencl/CLMemory.java +++ b/src/com/jogamp/opencl/CLMemory.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -45,7 +45,7 @@ import static com.jogamp.opencl.llb.gl.CLGL.*; /** * Common superclass for all OpenCL memory types. * Represents an OpenCL memory object and wraps an optional NIO buffer. - * @author Michael Bien + * @author Michael Bien, et al. */ public abstract class CLMemory extends CLObjectResource { diff --git a/src/com/jogamp/opencl/CLObject.java b/src/com/jogamp/opencl/CLObject.java index 58a6333c..5a57dc3f 100644 --- a/src/com/jogamp/opencl/CLObject.java +++ b/src/com/jogamp/opencl/CLObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: diff --git a/src/com/jogamp/opencl/CLObjectResource.java b/src/com/jogamp/opencl/CLObjectResource.java index fcea22c1..031199e8 100644 --- a/src/com/jogamp/opencl/CLObjectResource.java +++ b/src/com/jogamp/opencl/CLObjectResource.java @@ -1,3 +1,31 @@ +/* + * Copyright (c) 2011 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + /* * Created on Saturday, June 18 2011 02:36 */ @@ -7,7 +35,7 @@ import com.jogamp.common.AutoCloseable; /** * Releasable resource with an CL object ID. - * @author Michael Bien + * @author Michael Bien, et al. */ abstract class CLObjectResource extends CLObject implements CLResource, AutoCloseable { @@ -30,8 +58,8 @@ abstract class CLObjectResource extends CLObject implements CLResource, AutoClos } /** - * Implementation detail. - * TODO remove as soon we have extension methods. + * Implementation detail, satisfying {@link AutoCloseable}. + * Might be remove as soon we have extension methods, but shall validate with Java 1.5 specs. * @deprecated This method is not intended to be called from client code. * @see java.lang.AutoCloseable */ diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java index bd93caa3..7a4f6b43 100644 --- a/src/com/jogamp/opencl/CLPlatform.java +++ b/src/com/jogamp/opencl/CLPlatform.java @@ -99,7 +99,7 @@ import static com.jogamp.opencl.llb.CL.*; * concurrency:
* CLPlatform is threadsafe. * - * @author Michael Bien + * @author Michael Bien, et al. * @see #initialize() * @see #getDefault() * @see #listCLPlatforms() diff --git a/src/com/jogamp/opencl/CLProgram.java b/src/com/jogamp/opencl/CLProgram.java index d373d5d3..3919d374 100644 --- a/src/com/jogamp/opencl/CLProgram.java +++ b/src/com/jogamp/opencl/CLProgram.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -58,7 +58,7 @@ import static com.jogamp.common.nio.Buffers.*; * @see CLContext#createProgram(java.io.InputStream) * @see CLContext#createProgram(java.lang.String) * @see CLContext#createProgram(java.util.Map) - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLProgram extends CLObjectResource { diff --git a/src/com/jogamp/opencl/CLResource.java b/src/com/jogamp/opencl/CLResource.java index cd14c59c..578ba92d 100644 --- a/src/com/jogamp/opencl/CLResource.java +++ b/src/com/jogamp/opencl/CLResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: diff --git a/src/com/jogamp/opencl/CLSampler.java b/src/com/jogamp/opencl/CLSampler.java index f19f58de..fe780ac1 100644 --- a/src/com/jogamp/opencl/CLSampler.java +++ b/src/com/jogamp/opencl/CLSampler.java @@ -41,7 +41,7 @@ import static com.jogamp.opencl.util.CLUtil.*; /** * Object representing an OpenCL sampler. * @see CLContext#createSampler(com.jogamp.opencl.CLSampler.AddressingMode, com.jogamp.opencl.CLSampler.FilteringMode, boolean) - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLSampler extends CLObjectResource { diff --git a/src/com/jogamp/opencl/JOCLJNILibLoader.java b/src/com/jogamp/opencl/JOCLJNILibLoader.java index 6f56223d..4ee99f1a 100644 --- a/src/com/jogamp/opencl/JOCLJNILibLoader.java +++ b/src/com/jogamp/opencl/JOCLJNILibLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java index dcddd3df..6194d88b 100644 --- a/src/com/jogamp/opencl/gl/CLGLContext.java +++ b/src/com/jogamp/opencl/gl/CLGLContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -47,7 +47,7 @@ import static com.jogamp.opencl.llb.gl.CLGL.*; /** * OpenCL Context supporting JOGL-JOCL interoperablity. - * @author Michael Bien + * @author Michael Bien, et al. */ public final class CLGLContext extends CLContext { diff --git a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java index 36718f1a..e0bd7bd5 100644 --- a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java +++ b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java @@ -1,6 +1,35 @@ +/* + * Copyright (c) 2011 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + /* * Created on Wednesday, May 25 2011 00:57 */ + package com.jogamp.opencl.impl; import java.nio.IntBuffer; @@ -16,7 +45,7 @@ import static com.jogamp.opencl.CLException.*; /** * - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLTLAccessorFactory implements CLAccessorFactory { diff --git a/src/com/jogamp/opencl/llb/impl/CLImpl.java b/src/com/jogamp/opencl/llb/impl/CLImpl.java index 0713ac4d..253e19e6 100644 --- a/src/com/jogamp/opencl/llb/impl/CLImpl.java +++ b/src/com/jogamp/opencl/llb/impl/CLImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -43,7 +43,7 @@ import static com.jogamp.common.nio.Buffers.*; /** * Java bindings to OpenCL, the Open Computing Language. - * @author Michael Bien + * @author Michael Bien, et al. */ public class CLImpl extends CLAbstractImpl { diff --git a/src/com/jogamp/opencl/util/CLBuildListener.java b/src/com/jogamp/opencl/util/CLBuildListener.java index acd53a52..d21109f9 100644 --- a/src/com/jogamp/opencl/util/CLBuildListener.java +++ b/src/com/jogamp/opencl/util/CLBuildListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 JogAmp Community. All rights reserved. + * Copyright (c) 2009 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -39,7 +39,7 @@ import com.jogamp.opencl.CLProgram; * has been built (successfully or unsuccessfully).
* Note1: registering a build callback can make {@link com.jogamp.opencl.llb.CL#clBuildProgram} non blocking (OpenCL implementation dependent).
* Note2: the thread which calls this method is unspecified. The Application should ensure propper synchronization. - * @author Michael Bien + * @author Michael Bien, et al. * @see com.jogamp.opencl.llb.CL#clBuildProgram(long, int, com.jogamp.common.nio.PointerBuffer, java.lang.String, com.jogamp.opencl.llb.impl.BuildProgramCallback) */ public interface CLBuildListener { -- cgit v1.2.3