[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/demo/fisheye.py gfx/libmosaic/Mosaic.hx...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz gfx/demo/fisheye.py gfx/libmosaic/Mosaic.hx... |
|
Date: |
Fri, 13 Sep 2002 07:48:32 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/09/13 07:48:32
Modified files:
gfx/demo : fisheye.py
gfx/libmosaic : Mosaic.hxx
gfx/libos : Os-GLX.cxx Os.hxx
gfx/libutil : Vec23.hxx
gzz/gfx/gl : PaperMill.java Stencil.java
gzz/vob : SolidBgVob.java
gzz/vob/buoy : Buoy3Floater.java NadirAngler.java
lava/gfx/blob : surfstretch.hxx
lava/gzz/util : AbstractHeader822.java
metacode : copyrighter.py
Log message:
Make a few more files copyrighted (i.e., insert license boilerplates.
I very much hope this is in the authors' intent...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fisheye.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libmosaic/Mosaic.hxx.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libos/Os-GLX.cxx.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libos/Os.hxx.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/Vec23.hxx.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/PaperMill.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/SolidBgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/buoy/Buoy3Floater.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/buoy/NadirAngler.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gfx/blob/surfstretch.hxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/AbstractHeader822.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/copyrighter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/fisheye.py
diff -c gzz/gfx/demo/fisheye.py:1.17 gzz/gfx/demo/fisheye.py:1.18
*** gzz/gfx/demo/fisheye.py:1.17 Fri Sep 13 02:35:41 2002
--- gzz/gfx/demo/fisheye.py Fri Sep 13 07:48:31 2002
***************
*** 3,12 ****
execfile("gfx/libpaper/papermill.py")
! pdfimg =
"mstmpimg/0000000008000000E9377484930004EE0856BC11F38551006325788A14C474081350DF47A8280C-144-1"
pdftex = None
showpdf = 0
def globalkey(k):
global benchmark
global currentScene
--- 3,16 ----
execfile("gfx/libpaper/papermill.py")
! pdfbase =
"mstmpimg/0000000008000000E9377484930004EE0856BC11F38551006325788A14C474081350DF47A8280C-144-%s"
! page = 1
pdftex = None
+ texpage = page
showpdf = 0
+ def pdfimg(): return pdfbase % (page,)
+
def globalkey(k):
global benchmark
global currentScene
***************
*** 25,33 ****
pap.setNPasses(passno + 1)
ppass = pap.getPass(passno)
! global pdftex
! if pdftex == None:
! pdftex = getTex(pdfimg)
texid = pdftex.getTexId()
print "TEXID: ",texid
--- 29,38 ----
pap.setNPasses(passno + 1)
ppass = pap.getPass(passno)
! global pdftex, texpage
! if pdftex == None or page != texpage:
! pdftex = getTex(pdfimg())
! texpage = page
texid = pdftex.getTexId()
print "TEXID: ",texid
***************
*** 110,121 ****
self.fpq = getfisheyepaper(self.seed);
def key(self, k):
! global bx, by, bs, ba, bl, bm, px, py, ps
global gridsize
if k == "Up": py += 50
elif k == "Down": py -= 50
elif k == "Left": px += 50
elif k == "Right": px -= 50
elif k == "*": ps += .05
elif k == "/": ps -= .05
elif k == "e": by -= 100
--- 115,128 ----
self.fpq = getfisheyepaper(self.seed);
def key(self, k):
! global bx, by, bs, ba, bl, bm, px, py, ps, page
global gridsize
if k == "Up": py += 50
elif k == "Down": py -= 50
elif k == "Left": px += 50
elif k == "Right": px -= 50
+ elif k == "Prior": page = max(1, page-1); self.initpaper()
+ elif k == "Next": page = min(10, page+1); self.initpaper()
elif k == "*": ps += .05
elif k == "/": ps -= .05
elif k == "e": by -= 100
Index: gzz/gfx/libmosaic/Mosaic.hxx
diff -c gzz/gfx/libmosaic/Mosaic.hxx:1.8 gzz/gfx/libmosaic/Mosaic.hxx:1.9
*** gzz/gfx/libmosaic/Mosaic.hxx:1.8 Thu Sep 12 11:30:04 2002
--- gzz/gfx/libmosaic/Mosaic.hxx Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
#ifndef GZZ_MOSAIC_HXX
#define GZZ_MOSAIC_HXX
--- 1,25 ----
! /*
! Mosaic.hxx
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
#ifndef GZZ_MOSAIC_HXX
#define GZZ_MOSAIC_HXX
Index: gzz/gfx/libos/Os-GLX.cxx
diff -c gzz/gfx/libos/Os-GLX.cxx:1.8 gzz/gfx/libos/Os-GLX.cxx:1.9
*** gzz/gfx/libos/Os-GLX.cxx:1.8 Thu Sep 12 10:10:47 2002
--- gzz/gfx/libos/Os-GLX.cxx Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
/** GLX means either the GL X11 extension of OpenGL
* or GNU/LinuX, whichever you prefer.
--- 1,25 ----
! /*
! Os-GLX.cxx
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
/** GLX means either the GL X11 extension of OpenGL
* or GNU/LinuX, whichever you prefer.
Index: gzz/gfx/libos/Os.hxx
diff -c gzz/gfx/libos/Os.hxx:1.6 gzz/gfx/libos/Os.hxx:1.7
*** gzz/gfx/libos/Os.hxx:1.6 Fri Sep 13 06:18:26 2002
--- gzz/gfx/libos/Os.hxx Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
#ifndef GZZ_OS_HXX
#define GZZ_OS_HXX
--- 1,25 ----
! /*
! Os.hxx
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
#ifndef GZZ_OS_HXX
#define GZZ_OS_HXX
Index: gzz/gfx/libutil/Vec23.hxx
diff -c gzz/gfx/libutil/Vec23.hxx:1.6 gzz/gfx/libutil/Vec23.hxx:1.7
*** gzz/gfx/libutil/Vec23.hxx:1.6 Mon Aug 19 15:01:37 2002
--- gzz/gfx/libutil/Vec23.hxx Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
#ifndef __GUMMIBASIC_H
#define __GUMMIBASIC_H
--- 1,25 ----
! /*
! Vec23.hxx
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
#ifndef __GUMMIBASIC_H
#define __GUMMIBASIC_H
Index: gzz/gzz/gfx/gl/PaperMill.java
diff -c gzz/gzz/gfx/gl/PaperMill.java:1.3 gzz/gzz/gfx/gl/PaperMill.java:1.4
*** gzz/gzz/gfx/gl/PaperMill.java:1.3 Wed Sep 4 02:31:11 2002
--- gzz/gzz/gfx/gl/PaperMill.java Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
package gzz.gfx.gl;
import org.python.util.PythonInterpreter;
--- 1,25 ----
! /*
! PaperMill.java
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
package gzz.gfx.gl;
import org.python.util.PythonInterpreter;
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.9 gzz/gzz/gfx/gl/Stencil.java:1.10
*** gzz/gzz/gfx/gl/Stencil.java:1.9 Wed Sep 11 02:35:14 2002
--- gzz/gzz/gfx/gl/Stencil.java Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
package gzz.gfx.gl;
import gzz.vob.*;
--- 1,25 ----
! /*
! Stencil.java
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
package gzz.gfx.gl;
import gzz.vob.*;
Index: gzz/gzz/vob/SolidBgVob.java
diff -c gzz/gzz/vob/SolidBgVob.java:1.2 gzz/gzz/vob/SolidBgVob.java:1.3
*** gzz/gzz/vob/SolidBgVob.java:1.2 Wed Sep 4 18:15:39 2002
--- gzz/gzz/vob/SolidBgVob.java Fri Sep 13 07:48:31 2002
***************
*** 1,4 ****
! // (c) Matti Katila and Tuomas J. Lukka
package gzz.vob;
import java.awt.Color;
--- 1,25 ----
! /*
! SolidBgVob.java
! *
! * Copyright (c) 2002, Matti Katila and Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Matti Katila and Tuomas J. Lukka
! */
package gzz.vob;
import java.awt.Color;
Index: gzz/gzz/vob/buoy/Buoy3Floater.java
diff -c gzz/gzz/vob/buoy/Buoy3Floater.java:1.1
gzz/gzz/vob/buoy/Buoy3Floater.java:1.2
*** gzz/gzz/vob/buoy/Buoy3Floater.java:1.1 Thu Sep 12 09:04:03 2002
--- gzz/gzz/vob/buoy/Buoy3Floater.java Fri Sep 13 07:48:32 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
package gzz.vob.buoy;
--- 1,25 ----
! /*
! Buoy3Floater.java
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
package gzz.vob.buoy;
Index: gzz/gzz/vob/buoy/NadirAngler.java
diff -c gzz/gzz/vob/buoy/NadirAngler.java:1.1
gzz/gzz/vob/buoy/NadirAngler.java:1.2
*** gzz/gzz/vob/buoy/NadirAngler.java:1.1 Fri Sep 6 07:04:58 2002
--- gzz/gzz/vob/buoy/NadirAngler.java Fri Sep 13 07:48:32 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
package gzz.vob.buoy;
--- 1,25 ----
! /*
! NadirAngler.java
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
package gzz.vob.buoy;
Index: gzz/lava/gfx/blob/surfstretch.hxx
diff -c gzz/lava/gfx/blob/surfstretch.hxx:1.4
gzz/lava/gfx/blob/surfstretch.hxx:1.5
*** gzz/lava/gfx/blob/surfstretch.hxx:1.4 Fri Aug 16 07:20:20 2002
--- gzz/lava/gfx/blob/surfstretch.hxx Fri Sep 13 07:48:32 2002
***************
*** 1,4 ****
! // (c) Tuomas J. Lukka
//
#ifndef GZZ_SURFSTRETCH_HXX
--- 1,25 ----
! /*
! surfstretch.hxx
! *
! * Copyright (c) 2002, Tuomas J. Lukka
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Tuomas J. Lukka
! */
//
#ifndef GZZ_SURFSTRETCH_HXX
Index: gzz/lava/gzz/util/AbstractHeader822.java
diff -c gzz/lava/gzz/util/AbstractHeader822.java:1.1
gzz/lava/gzz/util/AbstractHeader822.java:1.2
*** gzz/lava/gzz/util/AbstractHeader822.java:1.1 Sat Aug 31 10:01:29 2002
--- gzz/lava/gzz/util/AbstractHeader822.java Fri Sep 13 07:48:32 2002
***************
*** 1,4 ****
! //(c):Benja Fallenstein
package gzz.util;
import java.io.*;
import java.util.*;
--- 1,25 ----
! /*
! AbstractHeader822.java
! *
! * Copyright (c) 2002, Benja Fallenstein
! *
! * You may use and distribute under the terms of either the GNU Lesser
! * General Public License, either version 2 of the license or,
! * at your choice, any later version. Alternatively, you may use and
! * distribute under the terms of the XPL.
! *
! * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
! * the licenses.
! *
! * This software is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
! * file for more details.
! *
! */
! /*
! * Written by Benja Fallenstein
! */
package gzz.util;
import java.io.*;
import java.util.*;
***************
*** 46,49 ****
public void writeTo(OutputStream out) {
}
! }
\ No newline at end of file
--- 67,70 ----
public void writeTo(OutputStream out) {
}
! }
Index: gzz/metacode/copyrighter.py
diff -c gzz/metacode/copyrighter.py:1.1 gzz/metacode/copyrighter.py:1.2
*** gzz/metacode/copyrighter.py:1.1 Thu Jul 25 03:07:10 2002
--- gzz/metacode/copyrighter.py Fri Sep 13 07:48:32 2002
***************
*** 1,19 ****
#
# Copyright (c) 2002, Benja Fallenstein
! #
# You may use and distribute under the terms of either the GNU Lesser
# General Public License, either version 2 of the license or,
# at your choice, any later version. Alternatively, you may use and
# distribute under the terms of the XPL.
! #
# See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
# the licenses.
! #
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
# file for more details.
! #
"""
copyrighter.py -- utility to add copyright notices to source files
--- 1,19 ----
#
# Copyright (c) 2002, Benja Fallenstein
! #
# You may use and distribute under the terms of either the GNU Lesser
# General Public License, either version 2 of the license or,
# at your choice, any later version. Alternatively, you may use and
# distribute under the terms of the XPL.
! #
# See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
# the licenses.
! #
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
# file for more details.
! #
"""
copyrighter.py -- utility to add copyright notices to source files
***************
*** 22,27 ****
--- 22,28 ----
one of the following lines:
//(c): PERSON
+ // (c) PERSON
#(c): PERSON
where PERSON is any string. It then inserts a Gzz-ish copyright statement
***************
*** 70,82 ****
for name in names:
file = os.path.join(dir, name)
if os.path.isdir(file): continue
! first = open(file, 'r').read(6)
! if first.startswith('//(c):') or first.startswith('#(c):'):
if first.startswith('#'):
pymode = 1; chars = 5
else:
! pymode = 0; chars = 6
lines = []
for l in open(file, 'r').readlines():
--- 71,88 ----
for name in names:
file = os.path.join(dir, name)
if os.path.isdir(file): continue
! first = open(file, 'r').read(7)
! if first.startswith('//(c):') or first.startswith('#(c):') or \
! first.startswith('// (c) '):
if first.startswith('#'):
pymode = 1; chars = 5
else:
! pymode = 0;
! if first.startswith('// '):
! chars = 7
! else:
! chars = 6
lines = []
for l in open(file, 'r').readlines():
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz gfx/demo/fisheye.py gfx/libmosaic/Mosaic.hx...,
Benja Fallenstein <=