summaryrefslogtreecommitdiffstats
path: root/ui/gfx/surface
diff options
context:
space:
mode:
authorpph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 18:52:04 +0000
committerpph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 18:52:04 +0000
commit928ca1d2c1f13f57b02b62576b0814b3337bedbd (patch)
tree9f8e385d3ccb5b0b45d6eff8392793dcf40a2225 /ui/gfx/surface
parenteeddc3ce39740f97156e42830d4865099c6b2eb9 (diff)
downloadchromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.zip
chromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.tar.gz
chromium_src-928ca1d2c1f13f57b02b62576b0814b3337bedbd.tar.bz2
gcc 4.6 warnings cleanup
BUG=87490 TEST=compile with gcc 4.6 Review URL: http://codereview.chromium.org/8050008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/surface')
-rw-r--r--ui/gfx/surface/accelerated_surface_linux.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gfx/surface/accelerated_surface_linux.cc b/ui/gfx/surface/accelerated_surface_linux.cc
index a74ac5c..da2dde4 100644
--- a/ui/gfx/surface/accelerated_surface_linux.cc
+++ b/ui/gfx/surface/accelerated_surface_linux.cc
@@ -23,7 +23,8 @@ AcceleratedSurface::AcceleratedSurface(const gfx::Size& size)
dpy, window, size_.width(), size_.height(), gwa.depth);
image_ = eglCreateImageKHR(
- edpy, EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR, (void*) pixmap_, NULL);
+ edpy, EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR,
+ reinterpret_cast<void*>(pixmap_), NULL);
glGenTextures(1, &texture_);