0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug introduced in code cleanup commit 5e0c3056d

Browse source 
The previous cleanup didn't handle the case when w or h is zero,
but resize_mode is not stretch.
This commit is contained in:
Galen Brooks 2018-01-28 23:33:51 -05:00 • committed by Gregory A Lundberg
parent d82fc9c4ad
commit 16c3fdae75
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gui/core/canvas.cpp
View file

@ -1109,27 +1109,28 @@ void image_shape::draw(surface& canvas,
surf = image_;
}
else { // assert((w != 0) || (h != 0))
if(w == 0) { // assert(h != 0)
if(resize_mode_ == stretch) {
DBG_GUI_D << "Image: vertical stretch from " << image_->w << ','
<< image_->h << " to a height of " << h << ".\n";
if(w == 0 && resize_mode_ == stretch) {
DBG_GUI_D << "Image: vertical stretch from " << image_->w << ','
<< image_->h << " to a height of " << h << ".\n";
surf = stretch_surface_vertical(image_, h);
}
surf = stretch_surface_vertical(image_, h);
w = image_->w;
}
else if(h == 0) { // assert(w != 0)
if(resize_mode_ == stretch) {
DBG_GUI_D << "Image: horizontal stretch from " << image_->w
<< ',' << image_->h << " to a width of " << w
<< ".\n";
else if(h == 0 && resize_mode_ == stretch) {
DBG_GUI_D << "Image: horizontal stretch from " << image_->w
<< ',' << image_->h << " to a width of " << w
<< ".\n";
surf = stretch_surface_horizontal(image_, w);
}
surf = stretch_surface_horizontal(image_, w);
h = image_->h;
}
else { // assert((w != 0) && (h != 0))
else {
if(w == 0) {
w = image_->w;
}
if(h == 0) {
h = image_->h;
}
if(resize_mode_ == tile) {
DBG_GUI_D << "Image: tiling from " << image_->w << ','
<< image_->h << " to " << w << ',' << h << ".\n";