From 937942b5ef2db0bd37e7c4480fd1a01b1e1ee26d Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Wed, 29 Jul 2015 17:14:48 -0400
Subject: [PATCH] Fix PShape ellipses

---
 core/src/processing/core/PGraphics.java      | 4 ++--
 core/src/processing/core/PShape.java         | 5 ++---
 core/src/processing/opengl/PShapeOpenGL.java | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index 47fc1fc57..bb272bad9 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -1795,8 +1795,8 @@ public class PGraphics extends PImage implements PConstants {
       return createShapePrimitive(kind, p);
 
     } else if (kind == ELLIPSE) {
-      if (len != 4 && len != 5) {
-        throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h) or createShape(ELLIPSE, x, y, w, h, mode)");
+      if (len != 4) {
+        throw new IllegalArgumentException("Use createShape(ELLIPSE, x, y, w, h)");
       }
       return createShapePrimitive(kind, p);
 
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
index 2add2a27d..768553079 100644
--- a/core/src/processing/core/PShape.java
+++ b/core/src/processing/core/PShape.java
@@ -1654,9 +1654,8 @@ public class PShape implements PConstants {
         }
       }
     } else if (kind == ELLIPSE) {
-      g.ellipseMode(CORNER);
-      g.ellipse(params[0], params[1], params[2], params[3]);
-
+      g.ellipse(params[0], params[1],
+                params[2], params[3]);
     } else if (kind == ARC) {
       if (params.length == 6) {
         g.arc(params[0], params[1],
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
index e35f4b5b6..3ddead7ce 100644
--- a/core/src/processing/opengl/PShapeOpenGL.java
+++ b/core/src/processing/opengl/PShapeOpenGL.java
@@ -3211,9 +3211,6 @@ public class PShapeOpenGL extends PShape {
       b = params[1];
       c = params[2];
       d = params[3];
-      if (params.length == 5) {
-        mode = (int)(params[4]);
-      }
     }
 
     float x = a;