summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <pixelflinger@google.com>2010-05-10 20:26:24 -0700
committerAndroid Code Review <code-review@android.com>2010-05-10 20:26:24 -0700
commit954cbf5b7f2c659a4c6842f22ccbb48afe14ab60 (patch)
tree2bf9fdf671ef3d1ee5286c4feb7f3b3f51c3717e /opengl
parent855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5 (diff)
parent81d42591f766928fe250a0182e707e864f6e1f54 (diff)
downloadframeworks_base-954cbf5b7f2c659a4c6842f22ccbb48afe14ab60.zip
frameworks_base-954cbf5b7f2c659a4c6842f22ccbb48afe14ab60.tar.gz
frameworks_base-954cbf5b7f2c659a4c6842f22ccbb48afe14ab60.tar.bz2
Merge "Fix glReadPixels() to verify that both x and y are non-negative."
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/texture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp
index 13d078e..89a19b6 100644
--- a/opengl/libagl/texture.cpp
+++ b/opengl/libagl/texture.cpp
@@ -1467,7 +1467,7 @@ void glReadPixels(
ogles_error(c, GL_INVALID_VALUE);
return;
}
- if (x<0 || x<0) {
+ if (x<0 || y<0) {
ogles_error(c, GL_INVALID_VALUE);
return;
}