diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 17:15:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 17:15:11 -0700 |
| commit | c1879a093334ceb577b5307a3a31b31d6847b728 (patch) | |
| tree | b6ac9b2777e72861b8bd58e48ed73d45158aa004 /libs/ui | |
| parent | 35b8aed5959fcc81d8ddbbd2db95fb4c038ba99d (diff) | |
| parent | d7ef08c08d50d1c01d30a242b04590bd3a272431 (diff) | |
| download | frameworks_base-c1879a093334ceb577b5307a3a31b31d6847b728.zip frameworks_base-c1879a093334ceb577b5307a3a31b31d6847b728.tar.gz frameworks_base-c1879a093334ceb577b5307a3a31b31d6847b728.tar.bz2 | |
Merge change 20365
* changes:
oops, EGLConfig of value zero may be valid
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/EGLUtils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ui/EGLUtils.cpp b/libs/ui/EGLUtils.cpp index 9b2839d..80bfdfd 100644 --- a/libs/ui/EGLUtils.cpp +++ b/libs/ui/EGLUtils.cpp @@ -61,8 +61,9 @@ status_t EGLUtils::selectConfigForPixelFormat( const int fbSzG = fbFormatInfo.getSize(PixelFormatInfo::INDEX_GREEN); const int fbSzB = fbFormatInfo.getSize(PixelFormatInfo::INDEX_BLUE); + int i; EGLConfig config = NULL; - for (int i=0 ; i<n ; i++) { + for (i=0 ; i<n ; i++) { EGLint r,g,b,a; eglGetConfigAttrib(dpy, configs[i], EGL_RED_SIZE, &r); eglGetConfigAttrib(dpy, configs[i], EGL_GREEN_SIZE, &g); @@ -76,7 +77,7 @@ status_t EGLUtils::selectConfigForPixelFormat( free(configs); - if (config) { + if (i<n) { *outConfig = config; return NO_ERROR; } |