Changeset 128047 in webkit

Timestamp:

Sep 10, 2012 5:34:52 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[TexMap] Fix compilation on Windows
​https://bugs.webkit.org/show_bug.cgi?id=96257

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-09-10
Reviewed by Noam Rosenthal.

TextureMapperGL uses near and far as variable names and unfortunately
WinDefs.h on Windows has the nasty habit of unconditionally(!) defining
near and far as empty macros. There's no way to prevent WinDefs.h from
doing so. Instead we rename the variables. (Another option would've been to
#undef)

• platform/graphics/texmap/TextureMapperGL.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [TexMap] Fix compilation on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=96257
+
+        Reviewed by Noam Rosenthal.
+
+        TextureMapperGL uses near and far as variable names and unfortunately
+        WinDefs.h on Windows has the nasty habit of unconditionally(!) defining
+        near and far as empty macros. There's no way to prevent WinDefs.h from
+        doing so. Instead we rename the variables. (Another option would've been to
+        #undef)
+
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+
 2012-09-10  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

@@ -751 +751 @@
 static inline TransformationMatrix createProjectionMatrix(const IntSize& size, bool mirrored)
 {
-    const float near = 9999999;
-    const float far = -99999;
+    const float nearValue = 9999999;
+    const float farValue = -99999;
 
     return TransformationMatrix(2.0 / float(size.width()), 0, 0, 0,
                                 0, (mirrored ? 2.0 : -2.0) / float(size.height()), 0, 0,
-                                0, 0, -2.f / (far - near), 0,
-                                -1, mirrored ? -1 : 1, -(far + near) / (far - near), 1);
+                                0, 0, -2.f / (farValue - nearValue), 0,
+                                -1, mirrored ? -1 : 1, -(farValue + nearValue) / (farValue - nearValue), 1);
 }