Skip to content

Merge v1.2 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2017
Merged

Merge v1.2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
112c4c9
Used cppcheck to fix a few harmless bugs.
cschreib Jan 5, 2015
249a1a8
Fixed compiler error/warnings created by change in FreeType
cschreib May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gui/impl/gui/gl/src/gui_gl_font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ font::font(const std::string& sFontFile, uint uiSize) : bKerning_(false)
iMaxBearingY = mFace->glyph->metrics.horiBearingY;

int iCharWidth = std::max(
mFace->glyph->bitmap.width + int(mFace->glyph->metrics.horiBearingX >> 6),
int(mFace->glyph->bitmap.width) + int(mFace->glyph->metrics.horiBearingX >> 6),
int(mFace->glyph->advance.x >> 6)
);

Expand Down Expand Up @@ -133,8 +133,8 @@ font::font(const std::string& sFontFile, uint uiSize) : bKerning_(false)
{
int iYBearing = iMaxBearingY - (mFace->glyph->metrics.horiBearingY >> 6);

for (int j = 0; j < mFace->glyph->bitmap.rows; ++j)
for (int i = 0; i < mFace->glyph->bitmap.width; ++i, ++sBuffer)
for (int j = 0; j < int(mFace->glyph->bitmap.rows); ++j)
for (int i = 0; i < int(mFace->glyph->bitmap.width); ++i, ++sBuffer)
pTexture_->set_pixel(x + i + uiXBearing, y + j + iYBearing, ub32color(255, 255, 255, *sBuffer));
}

Expand Down
2 changes: 1 addition & 1 deletion gui/src/gui_slider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void slider::set_max_value(float fMax)
if (fMax != fMaxValue_)
{
fMaxValue_ = fMax;
if (fMaxValue_ < fMaxValue_) fMaxValue_ = fMinValue_;
if (fMaxValue_ < fMinValue_) fMaxValue_ = fMinValue_;
else step_value(fMaxValue_, fValueStep_);

if (fValue_ > fMaxValue_)
Expand Down
2 changes: 1 addition & 1 deletion gui/src/gui_statusbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void status_bar::set_max_value(float fMax)
if (fMax != fMaxValue_)
{
fMaxValue_ = fMax;
if (fMaxValue_ < fMaxValue_) fMaxValue_ = fMinValue_;
if (fMaxValue_ < fMinValue_) fMaxValue_ = fMinValue_;
fValue_ = fValue_ > fMaxValue_ ? fMaxValue_ : (fValue_ < fMinValue_ ? fMinValue_ : fValue_);
fire_update_bar_texture_();
}
Expand Down
3 changes: 2 additions & 1 deletion gui/src/gui_uiobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ bool uiobject::is_visible() const

void uiobject::set_abs_dimensions(uint uiAbsWidth, uint uiAbsHeight)
{
if (uiAbsWidth_ != uiAbsWidth || !bIsWidthAbs_ || uiAbsHeight_ != uiAbsHeight || !bIsWidthAbs_)
if (uiAbsWidth_ != uiAbsWidth || !bIsWidthAbs_ ||
uiAbsHeight_ != uiAbsHeight || !bIsHeightAbs_)
{
pManager_->notify_object_moved();
bIsWidthAbs_ = true;
Expand Down
1 change: 0 additions & 1 deletion luapp/src/luapp_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,6 @@ std::string state::get_type_name(type mType)
void state::get_global(const std::string& sName)
{
std::deque<std::string> lDecomposedName;
std::string sVarName;
utils::string_vector lWords = utils::cut(sName, ":");
utils::string_vector::iterator iter1;
foreach (iter1, lWords)
Expand Down