summaryrefslogtreecommitdiffstats
path: root/src/newt
diff options
context:
space:
mode:
authorXerxes Rånby <[email protected]>2015-08-10 16:44:11 +0200
committerXerxes Rånby <[email protected]>2015-08-10 16:44:11 +0200
commit217d8b78a3d70d9be59d4537c7565118dfe1e277 (patch)
treea797ba55f98fc7afa002a4dfd0b2242e16f33714 /src/newt
parent2d837a7a7130702ad36b694875613fae77c7ef06 (diff)
Bug 1183: Cleanup x11/RandR javadoc and native/X11RandR13 signature comments
Diffstat (limited to 'src/newt')
-rw-r--r--src/newt/classes/jogamp/newt/driver/x11/RandR.java2
-rw-r--r--src/newt/native/X11RandR13.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/x11/RandR.java b/src/newt/classes/jogamp/newt/driver/x11/RandR.java
index f45762173..a421289e2 100644
--- a/src/newt/classes/jogamp/newt/driver/x11/RandR.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/RandR.java
@@ -55,7 +55,7 @@ public interface RandR {
* <li>{@link #getMonitorDeviceIds(long, ScreenDriver)}</li>
* <li>{@link #getAvailableRotations(long, ScreenDriver, int)}</li>
* <li>{@link #getMonitorModeProps(long, ScreenDriver, int)}</li>
- * <li>{@link #getCurrentMonitorModeProps(long, ScreenDriver, int)</li>
+ * <li>{@link #getCurrentMonitorModeProps(long, ScreenDriver, int)}</li>
* <li>{@link #getMonitorDeviceProps(long, ScreenDriver, List, int, MonitorMode)}</li>
* </ul>
* <p>
diff --git a/src/newt/native/X11RandR13.c b/src/newt/native/X11RandR13.c
index 37a6ea055..0dd53feb8 100644
--- a/src/newt/native/X11RandR13.c
+++ b/src/newt/native/X11RandR13.c
@@ -202,7 +202,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_RandR13_dumpInfo0
/*
* Class: jogamp_newt_driver_x11_RandR13
* Method: getMonitorDeviceIds0
- * Signature: (J)I
+ * Signature: (J)[I
*/
JNIEXPORT jintArray JNICALL Java_jogamp_newt_driver_x11_RandR13_getMonitorDeviceIds0
(JNIEnv *env, jclass clazz, jlong screenResources)
@@ -256,7 +256,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_RandR13_freeMonitorInfoHandle
/*
* Class: jogamp_newt_driver_x11_RandR13
* Method: getAvailableRotations0
- * Signature: (J)I
+ * Signature: (J)[I
*/
JNIEXPORT jintArray JNICALL Java_jogamp_newt_driver_x11_RandR13_getAvailableRotations0
(JNIEnv *env, jclass clazz, jlong monitorInfo)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 15:54:19 +0000
>221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 
JOGL as a whole may be used under the terms of the New BSD 3-clause license,
which is the common denominator of the following used 5 BSD licenses L.1 - L.5.

+++

Additional licenses compatible with the BSD 3-clause license are listed below A.1 - A...

+++

Exception is the content of folder 'make/lib'.
This folder contains build/test time only Java binaries (JAR) to ease the build setup.
Each JAR file has it's corresponding LICENSE file containing the 
source location and license text. None of these binaries are contained in any way 
by the generated and deployed JOGL binaries.

+++

L.1) The JOGL source tree contains code from the JogAmp Community
     which is covered by the Simplified BSD 2-clause license:

   Copyright 2010 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.

   You can address the JogAmp Community via:
       Web                http://jogamp.org/
       Forum/Mailinglist  http://jogamp.762907.n3.nabble.com/
       JogAmp Channel     server: conference.jabber.org room: jogamp
       Repository         http://jogamp.org/git/
       Email              mediastream _at_ jogamp _dot_ org


L.2) The JOGL source tree contains code from Sun Microsystems, Inc. 
     which is covered by the New BSD 3-clause license:

   Copyright (c) 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
   met:
   
   - Redistribution of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
   
   - Redistribution 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.
   
   Neither the name of Sun Microsystems, Inc. or the names of
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
   
   This software is provided "AS IS," without a warranty of any kind. ALL
   EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
   INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
   PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
   MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
   ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
   DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
   ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
   DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
   DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
   ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
   SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
   
   You acknowledge that this software is not designed or intended for use
   in the design, construction, operation or maintenance of any nuclear
   facility.

L.3) The JOGL source tree contains code ported from the OpenGL sample
     implementation by Silicon Graphics, Inc. This code is licensed under
     the SGI Free Software License B, Version 2.0

   License Applicability. Except to the extent portions of this file are
   made subject to an alternative license as permitted in the SGI Free
   Software License B, Version 2.0 (the "License"), the contents of this
   file are subject only to the provisions of the License. You may not use
   this file except in compliance with the License. You may obtain a copy
   of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
   Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
   
   http://oss.sgi.com/projects/FreeB
   
   Note that, as provided in the License, the Software is distributed on an
   "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
   DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
   CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
   PARTICULAR PURPOSE, AND NON-INFRINGEMENT.

L.4) The JOGL source tree contains code from the LWJGL project which is
     similarly covered by the New BSD 3-clause license:

   Copyright (c) 2002-2004 LWJGL Project
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are 
   met:
   
   * Redistributions of source code must retain the above copyright 
     notice, this list of conditions and the following disclaimer.
  
   * 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.
  
   * Neither the name of 'LWJGL' nor the names of 
     its contributors may be used to endorse or promote products derived 
     from this software without specific prior written permission.
   
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
   "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 THE COPYRIGHT OWNER 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.

L.5) The JOGL source tree also contains a Java port of Brian Paul's Tile
     Rendering library, used with permission of the author under the 
     New BSD 3-clause license instead of the original LGPL:

   Copyright (c) 1997-2005 Brian Paul. All Rights Reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
   met:
   
   - Redistribution of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
   
   - Redistribution 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.
   
   Neither the name of Brian Paul or the names of contributors may be
   used to endorse or promote products derived from this software
   without specific prior written permission.
   
   This software is provided "AS IS," without a warranty of any
   kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
   WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
   EXCLUDED. THE COPYRIGHT HOLDERS AND CONTRIBUTORS SHALL NOT BE
   LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING,
   MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO
   EVENT WILL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY
   LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
   CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
   REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
   INABILITY TO USE THIS SOFTWARE, EVEN IF THE COPYRIGHT HOLDERS OR
   CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

A.1) The JOGL source tree also contains header files from Khronos,
     reflecting OpenKODE, EGL, OpenGL ES1, OpenGL ES2 and OpenGL.

     http://www.khronos.org/legal/license/

   Copyright (c) 2007-2010 The Khronos Group Inc.
    
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and/or associated documentation files (the
   "Materials"), to deal in the Materials without restriction, including
   without limitation the rights to use, copy, modify, merge, publish,
   distribute, sublicense, and/or sell copies of the Materials, and to
   permit persons to whom the Materials are furnished to do so, subject to
   the following conditions:
    
   The above copyright notice and this permission notice shall be included
   in all copies or substantial portions of the Materials.
    
   THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.


A.2) The JOGL source tree contains code from The Apache Software Foundation
     which is covered by the Apache License Version 2.0

Apache Harmony - Open Source Java SE
=====================================

<http://harmony.apache.org/>

Author: The Apache Software Foundation (http://www.apache.org/).

Copyright 2006, 2010 The Apache Software Foundation.

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Files:
    src/jogamp/graph/geom/plane/AffineTransform.java
    src/jogamp/graph/geom/plane/IllegalPathStateException.java
    src/jogamp/graph/geom/plane/NoninvertibleTransformException.java
    src/jogamp/graph/geom/plane/PathIterator.java
    src/jogamp/graph/geom/plane/Path2D.java
    src/jogamp/graph/math/plane/Crossing.java
    src/org/apache/harmony/misc/HashCode.java


A.3) The JOGL source tree contains code from David Schweinsberg
     which is covered by the Apache License Version 2.0

Typecast
========

Typecast is a font development environment for OpenType font technology.

<http://typecast.dev.java.net/>

Author: David Schweinsberg

Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Files:
    src/net/java/dev/typecast/**

A.4) The JOGL source tree contains fonts from Ubuntu
     which is covered by the UBUNTU FONT LICENCE Version 1.0

Ubunut Font Family
==================

The Ubuntu Font Family are libre fonts funded by Canonical Ltd on behalf of the Ubuntu project. 

<http://font.ubuntu.com/>

Copyright 2010 Canonical Ltd.  
Licensed under the Ubuntu Font Licence 1.0

Author: Canonical Ltd., Dalton Maag

UBUNTU FONT LICENCE 
Version 1.0
http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt

Files:
    src/jogamp/graph/font/fonts/ubuntu/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 15:54:19 +0000