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
commit32a220aa6ef0ea78d50e42a63622869e069f9851 (patch)
tree1fafe871e10cecb7858713ada286381cae826336 /opengl
parent3658de5fdd3d2f71dc4b6c298261472348bb3ce0 (diff)
parenta48c654e8207ed820670ea3214a649ff7d92c8a3 (diff)
downloadframeworks_native-32a220aa6ef0ea78d50e42a63622869e069f9851.zip
frameworks_native-32a220aa6ef0ea78d50e42a63622869e069f9851.tar.gz
frameworks_native-32a220aa6ef0ea78d50e42a63622869e069f9851.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;
}