| @@ -136,8 +136,8 @@ int MemoryOutputStream::writeFromInputStream (InputStream& source, int64 maxNumB | |||||
| if (availableData > 0) | if (availableData > 0) | ||||
| { | { | ||||
| if (maxNumBytesToWrite > 0 && maxNumBytesToWrite < availableData) | |||||
| availableData = maxNumBytesToWrite; | |||||
| if (maxNumBytesToWrite > availableData) | |||||
| maxNumBytesToWrite = availableData; | |||||
| preallocate (data.getSize() + (size_t) maxNumBytesToWrite); | preallocate (data.getSize() + (size_t) maxNumBytesToWrite); | ||||
| } | } | ||||
| @@ -1161,8 +1161,6 @@ private: | |||||
| const double s2 = std::sqrt (s); | const double s2 = std::sqrt (s); | ||||
| rx *= s2; | rx *= s2; | ||||
| ry *= s2; | ry *= s2; | ||||
| rx2 = rx * rx; | |||||
| ry2 = ry * ry; | |||||
| c = 0; | c = 0; | ||||
| } | } | ||||
| @@ -712,7 +712,7 @@ private: | |||||
| if (totalW > maxMenuW) | if (totalW > maxMenuW) | ||||
| { | { | ||||
| numColumns = jmax (1, numColumns - 1); | numColumns = jmax (1, numColumns - 1); | ||||
| totalW = workOutBestSize (maxMenuW); // to update col widths | |||||
| workOutBestSize (maxMenuW); // to update col widths | |||||
| break; | break; | ||||
| } | } | ||||
| else if (totalW > maxMenuW / 2 || contentHeight < maxMenuH) | else if (totalW > maxMenuW / 2 || contentHeight < maxMenuH) | ||||
| @@ -1787,11 +1787,10 @@ void TextEditor::mouseUp (const MouseEvent& e) | |||||
| void TextEditor::mouseDoubleClick (const MouseEvent& e) | void TextEditor::mouseDoubleClick (const MouseEvent& e) | ||||
| { | { | ||||
| int tokenEnd = getTextIndexAt (e.x, e.y); | int tokenEnd = getTextIndexAt (e.x, e.y); | ||||
| int tokenStart = tokenEnd; | |||||
| int tokenStart = 0; | |||||
| if (e.getNumberOfClicks() > 3) | if (e.getNumberOfClicks() > 3) | ||||
| { | { | ||||
| tokenStart = 0; | |||||
| tokenEnd = getTotalNumChars(); | tokenEnd = getTotalNumChars(); | ||||
| } | } | ||||
| else | else | ||||