widelands

Merge lp:~tino79/widelands/fixbug1204226 into lp:widelands

  1. fixbug1204226
  2. Merge into trunk
Proposed by Tino
Status: Merged
Merged at revision: 6663
Proposed branch: lp:~tino79/widelands/fixbug1204226
Merge into: lp:widelands
Diff against target: 25 lines (+2/-2)
2 files modified
src/graphic/render/gl_surface_screen.cc (+1/-1)
src/graphic/render/gl_surface_texture.cc (+1/-1)
To merge this branch: bzr merge lp:~tino79/widelands/fixbug1204226
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+176620@code.launchpad.net

Description of the change

A quick fix for bug #1204226

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

Doh!!! That was really stupid that I did not catch this. Thanks for the find tino, would you mind committing this? I am unable to access launchpad for a while.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/graphic/render/gl_surface_screen.cc'
2--- src/graphic/render/gl_surface_screen.cc 2013-07-23 18:04:32 +0000
3+++ src/graphic/render/gl_surface_screen.cc 2013-07-24 08:03:33 +0000
4@@ -72,7 +72,7 @@
5 glDrawPixels(m_w, m_h, GL_RGBA, GL_UNSIGNED_BYTE, m_pixels.get());
6 }
7
8- m_pixels.reset(0);
9+ m_pixels.reset(nullptr);
10 }
11
12 uint16_t GLSurfaceScreen::get_pitch() const {
13
14=== modified file 'src/graphic/render/gl_surface_texture.cc'
15--- src/graphic/render/gl_surface_texture.cc 2013-07-23 18:04:32 +0000
16+++ src/graphic/render/gl_surface_texture.cc 2013-07-24 08:03:33 +0000
17@@ -228,7 +228,7 @@
18 GL_UNSIGNED_BYTE, m_pixels.get());
19 }
20
21- m_pixels.reset(0);
22+ m_pixels.reset(nullptr);
23 }
24
25 uint16_t GLSurfaceTexture::get_pitch() const {

Subscribers

People subscribed via source and target branches

to status/vote changes: