2003/10/28 23:55:30

darcs-hash:20040130074022-3ac31-d26934a5ae90ec5117b8ac03cea3ad790ab86edb.gz

diff --git a/src/org/xwt/plat/OpenGL.cc b/src/org/xwt/plat/OpenGL.cc
index 14884ef..12c6c81 100644 (file)
--- a/src/org/xwt/plat/OpenGL.cc
+++ b/src/org/xwt/plat/OpenGL.cc
@@ -180,7 +180,7 @@ void OpenGL$RectGLPicture::natInit(Object *data_, jboolean alphaOnly) {
 
 void OpenGL$RectGLPicture::draw(jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) { 
     cx2 = min(cx2, dx + width);
-    cy2 = min(cx2, dy + height);
+    cy2 = min(cy2, dy + height);
     if (cy2 <= cy1 || cx2 <= cx1) return;
     glEnable(GL_TEXTURE_RECTANGLE_EXT);
     glBindTexture(GL_TEXTURE_RECTANGLE_EXT, textureName);    
@@ -274,7 +274,7 @@ void OpenGL$SquareGLPicture::natInit(Object *data_, jboolean alphaOnly) {
 
 void OpenGL$SquareGLPicture::draw(jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {
     cx2 = min(cx2, dx + width);
-    cy2 = min(cx2, dy + height);
+    cy2 = min(cy2, dy + height);
     if (cy2 <= cy1 || cx2 <= cx1) return;
     float tx1 = (float) (cx1 - dx) / (float) texWidth;
     float ty1 = (float) (cy1 - dy) / (float) texHeight;