mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fix for some VC compiler warnings.

Browse source
This commit is contained in:
jules 2014-07-01 18:50:42 +01:00
parent ab774b814e
commit 36e7c12504
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_graphics/fonts/juce_GlyphArrangement.cpp
View file

@ -428,7 +428,7 @@ void GlyphArrangement::moveRangeOfGlyphs (int startIndex, int num, const float d
}
void GlyphArrangement::addLinesWithLineBreaks (const String& text, const Font& f,
int x, int y, int width, int height, Justification layout)
float x, float y, float width, float height, Justification layout)
{
GlyphArrangement ga;
ga.addJustifiedText (f, text, x, y, width, layout);
@ -609,7 +609,7 @@ void GlyphArrangement::spreadOutLine (const int start, const int num, const floa
void GlyphArrangement::splitLines (const String& text, Font font, int startIndex,
int x, int y, int width, int height, int maximumLines,
float x, float y, float width, float height, int maximumLines,
float lineWidth, Justification layout, float minimumHorizontalScale)
{
const int length = text.length();

4
modules/juce_graphics/fonts/juce_GlyphArrangement.h
View file

@ -307,9 +307,9 @@ private:
int fitLineIntoSpace (int start, int numGlyphs, float x, float y, float w, float h, const Font&,
Justification, float minimumHorizontalScale);
void spreadOutLine (int start, int numGlyphs, float targetWidth);
void splitLines (const String&, Font, int start, int x, int y, int w, int h, int maxLines,
void splitLines (const String&, Font, int start, float x, float y, float w, float h, int maxLines,
float lineWidth, Justification, float minimumHorizontalScale);
void addLinesWithLineBreaks (const String&, const Font&, int x, int y, int width, int height, Justification);
void addLinesWithLineBreaks (const String&, const Font&, float x, float y, float width, float height, Justification);
void drawGlyphUnderline (const Graphics&, const PositionedGlyph&, int, const AffineTransform&) const;
JUCE_LEAK_DETECTOR (GlyphArrangement)