[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11544: Added two patched from addre
From: |
Markus Gothe |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11544: Added two patched from address@hidden |
Date: |
Fri, 02 Oct 2009 20:10:30 +0200 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11544
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Fri 2009-10-02 20:10:30 +0200
message:
Added two patched from address@hidden
modified:
backend/Renderer_ogl.cpp
=== modified file 'backend/Renderer_ogl.cpp'
--- a/backend/Renderer_ogl.cpp 2009-07-20 17:31:35 +0000
+++ b/backend/Renderer_ogl.cpp 2009-10-02 18:10:30 +0000
@@ -746,8 +746,8 @@
size_t height = frame->height();
size_t width = frame->width();
- float zx = w_bounds / (float) width;
- float zy = h_bounds / (float) height;
+ float zx = w_bounds / static_cast<float>(width);
+ float zy = h_bounds / static_cast<float>(height);
glPixelZoom(zx, -zy); // flip & zoom image
glDrawPixels(width, height, GL_RGB, GL_UNSIGNED_BYTE, ptr);
@@ -792,6 +792,11 @@
_width = fabsf(x1 - x0);
_height = fabsf(y1 - y0);
+ glScalef((static_cast<float>(twipsToPixels(_width)) /
+ static_cast<float>(viewport_width),
+ static_cast<float>(twipsToPixels(_height)) /
+ static_cast<float>(viewport_height), 1.0f);
+
// Setup the clear color. The actual clearing will happen in end_display.
if (bg_color.m_a) {
glClearColor(bg_color.m_r / 255.0, bg_color.m_g / 255.0, bg_color.m_b /
255.0,
@@ -1312,7 +1317,7 @@
GLfloat width_info[2];
- glGetFloatv( GL_LINE_WIDTH_RANGE, width_info);
+ glGetFloatv(GL_LINE_WIDTH_RANGE, width_info);
if (width > width_info[1]) {
LOG_ONCE( log_unimpl("Your OpenGL implementation does not support the
line width" \
@@ -1589,6 +1594,8 @@
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
+ glDisable(GL_TEXTURE_GEN_S);
+ glDisable(GL_TEXTURE_GEN_T);
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11544: Added two patched from address@hidden,
Markus Gothe <=