[Widelands-dev] [Build #8864090] amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 15 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864090/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-18 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864090 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864093] i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 28 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864093/+files/buildlog_ubuntu-wily-i386.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-31 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864093 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864097] i386 build of widelands 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 27 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864097/+files/buildlog_ubuntu-xenial-i386.widelands_1%3A18-ppa0-bzr7709-201601180747~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-12 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864097 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
That is strange... i get also no warnings when using trunk or other older branches anymore. Maybe libpng has changed to suppress this warning? My current version of libpng is: 1.6.20-1 -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
I can't believe it... the messages appears again. May i have to set up my branch tree from scratch... Sorry for confusing. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
> The problem is that we do not have a bullet proof way of figuring out which
> ones are broken.
Maybe pngfix (part of libpng) would do the trick. pngfix does not change
anything by default, so
pngfix -q -w [file]
prints warnings (-w) while suppressing normal output (-q). I ran pngfix like
find . -name '*.png' -exec pngfix -q -w {} \;
The result are 38 images with wrong profile. See the
[[https://bugs.launchpad.net/widelands/+bug/1195724/+attachment/4551881/+files/pngfix.txt|output
]]
--
https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/png_alternative_method.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864091] i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 25 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864091/+files/buildlog_ubuntu-trusty-i386.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-17 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864091 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864096] amd64 build of widelands 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 18 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864096/+files/buildlog_ubuntu-xenial-amd64.widelands_1%3A18-ppa0-bzr7709-201601180747~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-10 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7709-201601180747~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864096 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864092] amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 17 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864092/+files/buildlog_ubuntu-wily-amd64.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-34 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864092 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864094] amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 18 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864094/+files/buildlog_ubuntu-vivid-amd64.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu15.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-24 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 in ubuntu vivid RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864094 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8864095] i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 27 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864095/+files/buildlog_ubuntu-vivid-i386.widelands_1%3A18-ppa0-bzr7709-201601180746~ubuntu15.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-08 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7709-201601180746~ubuntu15.04.1 in ubuntu vivid RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8864095 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands
First test looks good. This afternoon i am on my other computer and test there again. -- https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
Both optipng and pngcrush were not able to "fix" (remove the unknown profile) all images. AdvaneCOMP was able to: http://www.advancemame.it/doc-advdef.html Now with this branch I get no warning messages from libPNG any longer. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands has been updated. Commit Message changed to: Fixing warning "known incorrect sRGB profile" only to the files which are causing this warning. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
Review: Approve Tested and works for me. A much better solution than changing all pictures. Could you add to the commit message the process how you found out that these are the ones that are troublesome and how you fixed them? I guess we'll need to repeat this eventually again (when we have newly messed up images) and it would be nice if we do not start from scratch again. Feel free to merge this afterwards. -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
Review: Disapprove Superseded by https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/png_alternative_method into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Travis build 300 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/103208466. -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands
this fixes bug 1302565. -- https://code.launchpad.net/~widelands-dev/widelands/screenshot_from_backbuffer/+merge/283043 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands has been updated. Commit Message changed to: - Write screenshot before swapping data into the backbuffer. Before this change, we used glReadPixels() which always reads the backbuffer, i.e. the last frame. Now we force a redraw when a screenshot is requested and save the screenshot from the freshly drawn backbuffer before it is swapped to the front. - m_blub -> blub_ in class Graphic. - removed Graphic::save_png, since it was a stateless wrapper for save_to_png(). For more details, see: https://code.launchpad.net/~widelands-dev/widelands/screenshot_from_backbuffer/+merge/283043 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands
SirVer has proposed merging
lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands.
Commit message:
- Write screenshot before swapping data into the backbuffer. Before this
change, we used glReadPixels() which always reads the backbuffer, i.e. the last
frame. Now we force a redraw when a screenshot is requested and save the
screenshot from the freshly drawn backbuffer before it is swapped to the front.
- m_blub -> blub_ in class Graphic.
- removed Graphic::save_png, since it was a stateless wrapper for save_to_png().
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1302565 in widelands: "Screenshot shows wrong image when a game is
chosen with the mouse pointer"
https://bugs.launchpad.net/widelands/+bug/1302565
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/screenshot_from_backbuffer/+merge/283043
See commit message above.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands.
=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt 2016-01-16 15:19:32 +
+++ src/graphic/CMakeLists.txt 2016-01-19 07:44:26 +
@@ -204,6 +204,7 @@
base_macros
economy
graphic
+graphic_image_io
graphic_surface
logic
wui_mapview_pixelfunctions
=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc 2016-01-16 15:19:32 +
+++ src/graphic/graphic.cc 2016-01-19 07:44:26 +
@@ -70,9 +70,9 @@
* Initialize the SDL video mode.
*/
void Graphic::initialize(int window_mode_w, int window_mode_h, bool init_fullscreen) {
- m_window_mode_width = window_mode_w;
- m_window_mode_height = window_mode_h;
- m_requires_update = true;
+ window_mode_width_ = window_mode_w;
+ window_mode_height_ = window_mode_h;
+ requires_update_ = true;
// Request an OpenGL 2 context with double buffering.
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -80,19 +80,19 @@
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
- log("Graphics: Try to set Videomode %ux%u\n", m_window_mode_width, m_window_mode_height);
- m_sdl_window =
+ log("Graphics: Try to set Videomode %ux%u\n", window_mode_width_, window_mode_height_);
+ sdl_window_ =
SDL_CreateWindow("Widelands Window", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
- m_window_mode_width, m_window_mode_height, SDL_WINDOW_OPENGL);
+ window_mode_width_, window_mode_height_, SDL_WINDOW_OPENGL);
resolution_changed();
set_fullscreen(init_fullscreen);
- SDL_SetWindowTitle(m_sdl_window, ("Widelands " + build_id() + '(' + build_type() + ')').c_str());
- set_icon(m_sdl_window);
+ SDL_SetWindowTitle(sdl_window_, ("Widelands " + build_id() + '(' + build_type() + ')').c_str());
+ set_icon(sdl_window_);
- m_glcontext = SDL_GL_CreateContext(m_sdl_window);
- SDL_GL_MakeCurrent(m_sdl_window, m_glcontext);
+ gl_context_ = SDL_GL_CreateContext(sdl_window_);
+ SDL_GL_MakeCurrent(sdl_window_, gl_context_);
#ifdef USE_GLBINDING
glbinding::Binding::initialize();
@@ -128,12 +128,12 @@
glClear(GL_COLOR_BUFFER_BIT);
- SDL_GL_SwapWindow(m_sdl_window);
+ SDL_GL_SwapWindow(sdl_window_);
/* Information about the video capabilities. */
{
SDL_DisplayMode disp_mode;
- SDL_GetWindowDisplayMode(m_sdl_window, _mode);
+ SDL_GetWindowDisplayMode(sdl_window_, _mode);
log(" GRAPHICS REPORT \n"
" VIDEO DRIVER %s\n"
" pixel fmt %u\n"
@@ -156,13 +156,13 @@
if (UI::g_fh)
UI::g_fh->flush();
- if (m_sdl_window) {
- SDL_DestroyWindow(m_sdl_window);
- m_sdl_window = nullptr;
+ if (sdl_window_) {
+ SDL_DestroyWindow(sdl_window_);
+ sdl_window_ = nullptr;
}
- if (m_glcontext) {
- SDL_GL_DeleteContext(m_glcontext);
- m_glcontext = nullptr;
+ if (gl_context_) {
+ SDL_GL_DeleteContext(gl_context_);
+ gl_context_ = nullptr;
}
}
@@ -183,21 +183,21 @@
}
void Graphic::change_resolution(int w, int h) {
- m_window_mode_width = w;
- m_window_mode_height = h;
+ window_mode_width_ = w;
+ window_mode_height_ = h;
if (!fullscreen()) {
- SDL_SetWindowSize(m_sdl_window, w, h);
+ SDL_SetWindowSize(sdl_window_, w, h);
resolution_changed();
}
}
void Graphic::resolution_changed() {
int new_w, new_h;
- SDL_GetWindowSize(m_sdl_window, _w, _h);
+ SDL_GetWindowSize(sdl_window_, _w, _h);
screen_.reset(new Screen(new_w, new_h));
- m_rendertarget.reset(new RenderTarget(screen_.get()));
+ render_target_.reset(new RenderTarget(screen_.get()));
Notifications::publish(GraphicResolutionChanged{new_w, new_h});
@@ -209,13 +209,13 @@
*/
RenderTarget * Graphic::get_render_target()
{
- m_rendertarget->reset();
- return m_rendertarget.get();
+ render_target_->reset();
+ return render_target_.get();
}
bool Graphic::fullscreen()
{
- uint32_t flags = SDL_GetWindowFlags(m_sdl_window);
+ uint32_t flags =
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_zip_filesystem. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_zip_filesystem. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
I used a little bash script which uses a txt file containing the path and name of the wrong images: #!/bin/bash while read line; do echo "Working on: " $line convert $line $line done < "$1" -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands
I found the crash and fixed it in 7711. Thanks! > I also notice that this branch is slower than trunk, scrolling isn't as > smooth. I cannot repro this - OpenGL calls and CPU load is exactly the same as trunk for me. Could you doublecheck and quantify this? -- https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
> kaputtnik, just in case you did not know, you can also merge. Everybody can! Yes i know, but i am too slow :-( Maybe too old :-D Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
Two approves should be enough for everybody :) kaputtnik, just in case you did not know, you can also merge. Everybody can! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
Review: Approve No more incorrect profile warnings on windows, nice! -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_fix_only_relevant into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/png_fix_only_relevant into
lp:widelands has been updated.
Commit Message changed to:
Fixing warning "known incorrect sRGB profile" only to the files which are
causing this warning.
Finding images with wrong profile:
find -name '*.png' -exec pngfix -q -w {} \;
pngfix is part of libpng.
Corrections could be done with imagmagicks convert program:
convert path/to/input.png path/to/output.png
Where input.png and output.png the same image is.
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/png_fix_only_relevant.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/png_fix_only_relevant mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_png_fix_only_relevant You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
