From 36e7c125043f00f73e14776a36b60bf2804dfb92 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 1 Jul 2014 18:50:42 +0100 Subject: [PATCH] Fix for some VC compiler warnings. --- modules/juce_graphics/fonts/juce_GlyphArrangement.cpp | 4 ++-- modules/juce_graphics/fonts/juce_GlyphArrangement.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp b/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp index 9bcd766011..8ad3b7b2ff 100644 --- a/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp +++ b/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp @@ -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(); diff --git a/modules/juce_graphics/fonts/juce_GlyphArrangement.h b/modules/juce_graphics/fonts/juce_GlyphArrangement.h index 15dbf526e2..ad27a57ed6 100644 --- a/modules/juce_graphics/fonts/juce_GlyphArrangement.h +++ b/modules/juce_graphics/fonts/juce_GlyphArrangement.h @@ -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)