From 48c2f42802c5ec22b12e0cc62aeacea647f2523c Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 21 Feb 2014 16:00:39 +0000 Subject: [PATCH] Added a safety check and fixed a couple of warnings. --- .../juce_audio_basics/midi/juce_MidiMessage.cpp | 4 ++-- .../juce_audio_processors.cpp | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp index ef08098d8f..6fa9ae20dc 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp @@ -679,8 +679,8 @@ MidiMessage MidiMessage::textMetaEvent (int type, const StringRef& text) const size_t headerLen = sizeof (header) - n; - uint8* const dest = result.allocateSpace (headerLen + textSize); - result.size = headerLen + textSize; + uint8* const dest = result.allocateSpace ((int) (headerLen + textSize)); + result.size = (int) (headerLen + textSize); memcpy (dest, header + n, headerLen); memcpy (dest + headerLen, text.text.getAddress(), textSize); diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp index f26421028c..78d3387670 100644 --- a/modules/juce_audio_processors/juce_audio_processors.cpp +++ b/modules/juce_audio_processors/juce_audio_processors.cpp @@ -119,15 +119,18 @@ struct AutoResizingNSViewComponentWithParent : public AutoResizingNSViewCompone { if (NSView* parent = (NSView*) getView()) { - if (NSView* child = [[parent subviews] objectAtIndex: 0]) + if ([[parent subviews] count] > 0) { - NSRect f = [parent frame]; - NSSize newSize = [child frame].size; - - if (f.size.width != newSize.width || f.size.height != newSize.height) + if (NSView* child = [[parent subviews] objectAtIndex: 0]) { - f.size = newSize; - [parent setFrame: f]; + NSRect f = [parent frame]; + NSSize newSize = [child frame].size; + + if (f.size.width != newSize.width || f.size.height != newSize.height) + { + f.size = newSize; + [parent setFrame: f]; + } } } }