From 2c5bfb952f6a5d981273844ec5b71b5ac7bcce1a Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 15 Mar 2013 17:48:53 +0000
Subject: [PATCH] Minor clean-ups.

---
 modules/juce_core/streams/juce_MemoryOutputStream.cpp | 4 ++--
 modules/juce_gui_basics/drawables/juce_SVGParser.cpp  | 2 --
 modules/juce_gui_basics/menus/juce_PopupMenu.cpp      | 2 +-
 modules/juce_gui_basics/widgets/juce_TextEditor.cpp   | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/juce_core/streams/juce_MemoryOutputStream.cpp b/modules/juce_core/streams/juce_MemoryOutputStream.cpp
index c0e270583c..79d51d41fb 100644
--- a/modules/juce_core/streams/juce_MemoryOutputStream.cpp
+++ b/modules/juce_core/streams/juce_MemoryOutputStream.cpp
@@ -136,8 +136,8 @@ int MemoryOutputStream::writeFromInputStream (InputStream& source, int64 maxNumB
 
     if (availableData > 0)
     {
-        if (maxNumBytesToWrite > 0 && maxNumBytesToWrite < availableData)
-            availableData = maxNumBytesToWrite;
+        if (maxNumBytesToWrite > availableData)
+            maxNumBytesToWrite = availableData;
 
         preallocate (data.getSize() + (size_t) maxNumBytesToWrite);
     }
diff --git a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
index 48ea05825f..728e343947 100644
--- a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
+++ b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
@@ -1161,8 +1161,6 @@ private:
             const double s2 = std::sqrt (s);
             rx *= s2;
             ry *= s2;
-            rx2 = rx * rx;
-            ry2 = ry * ry;
             c = 0;
         }
 
diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
index 0eb463faba..5aa0443e4d 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
@@ -712,7 +712,7 @@ private:
             if (totalW > maxMenuW)
             {
                 numColumns = jmax (1, numColumns - 1);
-                totalW = workOutBestSize (maxMenuW); // to update col widths
+                workOutBestSize (maxMenuW); // to update col widths
                 break;
             }
             else if (totalW > maxMenuW / 2 || contentHeight < maxMenuH)
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
index faa084dd8e..18142be1ec 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
@@ -1787,11 +1787,10 @@ void TextEditor::mouseUp (const MouseEvent& e)
 void TextEditor::mouseDoubleClick (const MouseEvent& e)
 {
     int tokenEnd = getTextIndexAt (e.x, e.y);
-    int tokenStart = tokenEnd;
+    int tokenStart = 0;
 
     if (e.getNumberOfClicks() > 3)
     {
-        tokenStart = 0;
         tokenEnd = getTotalNumChars();
     }
     else