From 7c3e205236ee207eada4dee55857d839edc56c2e Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 2 Aug 2015 20:29:50 +0100 Subject: [PATCH] Changed certain types of variables and converted certain variables when needed in the Contact Editor Sound form. --- source/contacteditor/frmContactEditorSound.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp index 6e1fab0..b4ab352 100644 --- a/source/contacteditor/frmContactEditorSound.cpp +++ b/source/contacteditor/frmContactEditorSound.cpp @@ -42,7 +42,7 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event ) wxString wxSAudioFilename; wxString wxSAudioMIMEType; sf::SoundBuffer AudioBuffer; - size_t len; + wxFileOffset len; std::string b64enc; wxSAudioFilename = fipSound->GetPath(); @@ -56,11 +56,11 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event ) */ if (AudioFile.Open(wxSAudioFilename, wxFile::read)){ - size_t flen; + ssize_t flen; len = AudioFile.Length(); unsigned char* AudioFileData = new unsigned char[len]; - flen = AudioFile.Read(AudioFileData, len); + flen = AudioFile.Read(AudioFileData, (size_t)len); // Get MIME Type. @@ -90,7 +90,7 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event ) // Check to make sure it is an audio file. - if (!AudioBuffer.loadFromMemory(AudioFileData, len)){ + if (!AudioBuffer.loadFromMemory(AudioFileData, (size_t)len)){ // Can't load file. We must flee... // Also show an error message too. -- 2.39.2