Skip to content

Commit 029f1d1

Browse files
codeanticodecodeanticode
committed
changes to facilitate android port, update copyright notices
1 parent 788453a commit 029f1d1

27 files changed

+359
-1075
lines changed

‎core/src/processing/opengl/FontTexture.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
22

33
/*
4-
Part of the Processing project - http://processing.org
4+
Processing OpenGL (c) 2011-2015 Andres Colubri
55
6-
Copyright (c) 2011-12 Ben Fry and Casey Reas
6+
Part of the Processing project - http://processing.org
7+
Copyright (c) 2001-04 Massachusetts Institute of Technology
8+
Copyright (c) 2004-12 Ben Fry and Casey Reas
9+
Copyright (c) 2012-15 The Processing Foundation
710
811
This library is free software; you can redistribute it and/or
912
modify it under the terms of the GNU Lesser General Public
10-
License as published by the Free Software Foundation; either
11-
version 2.1 of the License, or (at your option) any later version.
13+
License version 2.1 as published by the Free Software Foundation.
1214
1315
This library is distributed in the hope that it will be useful,
1416
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +21,7 @@
1921
Public License along with this library; if not, write to the
2022
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
2123
Boston, MA 02111-1307 USA
22-
*/
24+
*/
2325

2426
package processing.opengl;
2527

‎core/src/processing/opengl/FrameBuffer.java‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
22

33
/*
4-
Part of the Processing project - http://processing.org
4+
Processing OpenGL (c) 2011-2015 Andres Colubri
55
6-
Copyright (c) 2011-12 Ben Fry and Casey Reas
6+
Part of the Processing project - http://processing.org
7+
Copyright (c) 2001-04 Massachusetts Institute of Technology
8+
Copyright (c) 2004-12 Ben Fry and Casey Reas
9+
Copyright (c) 2012-15 The Processing Foundation
710
811
This library is free software; you can redistribute it and/or
912
modify it under the terms of the GNU Lesser General Public
10-
License as published by the Free Software Foundation; either
11-
version 2.1 of the License, or (at your option) any later version.
13+
License version 2.1 as published by the Free Software Foundation.
1214
1315
This library is distributed in the hope that it will be useful,
1416
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +21,7 @@
1921
Public License along with this library; if not, write to the
2022
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
2123
Boston, MA 02111-1307 USA
22-
*/
24+
*/
2325

2426
package processing.opengl;
2527

@@ -150,31 +152,6 @@ public class FrameBuffer implements PConstants {
150152
}
151153

152154

153-
// @Override
154-
// protected void finalize() throws Throwable {
155-
// try {
156-
// if (!screenFb) {
157-
// if (glFbo != 0) {
158-
// PGraphicsOpenGL.finalizeFrameBufferObject(glFbo, context);
159-
// }
160-
// if (glDepth != 0) {
161-
// PGraphicsOpenGL.finalizeRenderBufferObject(glDepth, context);
162-
// }
163-
// if (glStencil != 0) {
164-
// PGraphicsOpenGL.finalizeRenderBufferObject(glStencil, context);
165-
// }
166-
// if (glMultisample != 0) {
167-
// PGraphicsOpenGL.finalizeRenderBufferObject(glMultisample, context);
168-
// }
169-
// if (glDepthStencil != 0) {
170-
// PGraphicsOpenGL.finalizeRenderBufferObject(glDepthStencil, context);
171-
// }
172-
// }
173-
// } finally {
174-
// super.finalize();
175-
// }
176-
// }
177-
178155
public void clear() {
179156
pg.pushFramebuffer();
180157
pg.setFramebuffer(this);

0 commit comments

Comments
 (0)