Changeset 753Tweet

Timestamp:

Apr 4, 2011, 2:05:52 AM (10 years ago)

Author:

sam

Message:

video: implement Video::GetSize() in addition to GetWidth() and GetHeight().

Location:

trunk/src

Files:

• video.cpp (modified) (1 diff)
• video.h (modified) (1 diff)

trunk/src/video.cpp

@@ -245 +245 @@
 }
 
-int Video::GetWidth()
-{
-#if defined ANDROID_NDK
-    return saved_viewport.x;
+vec2i Video::GetSize()
+{
+#if defined ANDROID_NDK
+    return saved_viewport;
 #else
     GLint v[4];
     glGetIntegerv(GL_VIEWPORT, v);
-    return v[2];
-#endif
+    return vec2i(v[2], v[3]);
+#endif
+}
+
+int Video::GetWidth()
+{
+    return GetSize().x;
 }
 
 int Video::GetHeight()
 {
-#if defined ANDROID_NDK
-    return saved_viewport.y;
-#else
-    GLint v[4];
-    glGetIntegerv(GL_VIEWPORT, v);
-    return v[3];
-#endif
+    return GetSize().y;
 }
 

trunk/src/video.h

@@ -32 +32 @@
     static void Clear();
     static void Capture(uint32_t *buffer);
+    static vec2i GetSize();
     static int GetWidth();
     static int GetHeight();