From ae34d072f22b8057434bea9666b32ddefbfe4b18 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 19 May 2008 16:04:55 +0000 Subject: [PATCH] --- .../audio/audio_file_formats/oggvorbis/ogg.h | 2 +- .../components/special/juce_QuickTimeMovieComponent.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/juce_appframework/audio/audio_file_formats/oggvorbis/ogg.h b/src/juce_appframework/audio/audio_file_formats/oggvorbis/ogg.h index 4042c011b0..5bf44c5dcb 100644 --- a/src/juce_appframework/audio/audio_file_formats/oggvorbis/ogg.h +++ b/src/juce_appframework/audio/audio_file_formats/oggvorbis/ogg.h @@ -42,7 +42,7 @@ typedef struct { } ogg_page; -static ogg_uint32_t bitreverse(ogg_uint32_t x){ +ogg_uint32_t bitreverse(ogg_uint32_t x){ x= ((x>>16)&0x0000ffffUL) | ((x<<16)&0xffff0000UL); x= ((x>> 8)&0x00ff00ffUL) | ((x<< 8)&0xff00ff00UL); x= ((x>> 4)&0x0f0f0f0fUL) | ((x<< 4)&0xf0f0f0f0UL); diff --git a/src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.cpp b/src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.cpp index ef5ba87a35..3f9930ecac 100644 --- a/src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.cpp +++ b/src/juce_appframework/gui/components/special/juce_QuickTimeMovieComponent.cpp @@ -913,11 +913,9 @@ static Handle createHandleDataRef (Handle dataHandle, const char* fileName) if (err == noErr) { Str255 suffix; -#if JUCE_WIN32 - strcpy_s ((char*) suffix, 128, fileName); -#else - strcpy ((char*) suffix, fileName); -#endif + + CharacterFunctions::copy ((char*) suffix, fileName, 128); + StringPtr name = suffix; err = PtrAndHand (name, dataRef, name[0] + 1);