| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := Introjucer | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := Introjucer | |||
| @@ -182,7 +182,7 @@ private: | |||
| out << config.getGCCLibraryPathFlags(); | |||
| const char* defaultLibs[] = { "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", "Xext", 0 }; | |||
| const char* defaultLibs[] = { "dl", "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", "Xext", 0 }; | |||
| StringArray libs (defaultLibs); | |||
| for (int i = 0; i < libs.size(); ++i) | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := JuceDemo | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := JuceDemo | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| TARGET := JuceDemoPlugin.so | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| TARGET := JuceDemoPlugin.so | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| TARGET := Plugin\ Host | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode | |||
| TARGET := Plugin\ Host | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := BinaryBuilder | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := BinaryBuilder | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := HelloWorld | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := HelloWorld | |||
| @@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := Jucer | |||
| @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release) | |||
| CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | |||
| CXXFLAGS += $(CFLAGS) | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lXext | |||
| LDDEPS := | |||
| RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode | |||
| TARGET := Jucer | |||
| @@ -665,7 +665,7 @@ void AudioDeviceManager::audioDeviceIOCallbackInt (const float** inputChannelDat | |||
| else | |||
| { | |||
| for (int i = 0; i < numOutputChannels; ++i) | |||
| zeromem (outputChannelData[i], sizeof (float) * numSamples); | |||
| zeromem (outputChannelData[i], sizeof (float) * (size_t) numSamples); | |||
| } | |||
| if (testSound != nullptr) | |||
| @@ -112,14 +112,14 @@ void AudioSourcePlayer::audioDeviceIOCallback (const float** inputChannelData, | |||
| for (i = 0; i < numOutputs; ++i) | |||
| { | |||
| channels[numActiveChans] = outputChans[i]; | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * numSamples); | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * (size_t) numSamples); | |||
| ++numActiveChans; | |||
| } | |||
| for (i = numOutputs; i < numInputs; ++i) | |||
| { | |||
| channels[numActiveChans] = tempBuffer.getSampleData (i - numOutputs, 0); | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * numSamples); | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * (size_t) numSamples); | |||
| ++numActiveChans; | |||
| } | |||
| } | |||
| @@ -128,14 +128,14 @@ void AudioSourcePlayer::audioDeviceIOCallback (const float** inputChannelData, | |||
| for (i = 0; i < numInputs; ++i) | |||
| { | |||
| channels[numActiveChans] = outputChans[i]; | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * numSamples); | |||
| memcpy (channels[numActiveChans], inputChans[i], sizeof (float) * (size_t) numSamples); | |||
| ++numActiveChans; | |||
| } | |||
| for (i = numInputs; i < numOutputs; ++i) | |||
| { | |||
| channels[numActiveChans] = outputChans[i]; | |||
| zeromem (channels[numActiveChans], sizeof (float) * numSamples); | |||
| zeromem (channels[numActiveChans], sizeof (float) * (size_t) numSamples); | |||
| ++numActiveChans; | |||
| } | |||
| } | |||
| @@ -157,7 +157,7 @@ void AudioSourcePlayer::audioDeviceIOCallback (const float** inputChannelData, | |||
| { | |||
| for (int i = 0; i < totalNumOutputChannels; ++i) | |||
| if (outputChannelData[i] != nullptr) | |||
| zeromem (outputChannelData[i], sizeof (float) * numSamples); | |||
| zeromem (outputChannelData[i], sizeof (float) * (size_t) numSamples); | |||
| } | |||
| } | |||
| @@ -43,7 +43,7 @@ public: | |||
| /** Generates a simple hash from an integer. */ | |||
| static int generateHash (const int key, const int upperLimit) noexcept { return std::abs (key) % upperLimit; } | |||
| /** Generates a simple hash from a string. */ | |||
| static int generateHash (const String& key, const int upperLimit) noexcept { return (int) (((uint32) key.hashCode()) % upperLimit); } | |||
| static int generateHash (const String& key, const int upperLimit) noexcept { return (int) (((uint32) key.hashCode()) % (uint32) upperLimit); } | |||
| /** Generates a simple hash from a variant. */ | |||
| static int generateHash (const var& key, const int upperLimit) noexcept { return generateHash (key.toString(), upperLimit); } | |||
| }; | |||
| @@ -40,6 +40,10 @@ | |||
| to an object. If you use the assignment operator to assign a different object to a | |||
| ScopedPointer, the old one will be automatically deleted. | |||
| Important note: The class is designed to hold a pointer to an object, NOT to an array! | |||
| It calls delete on its payload, not delete[], so do not give it an array to hold! For | |||
| that kind of purpose, you should be using HeapBlock or Array instead. | |||
| A const ScopedPointer is guaranteed not to lose ownership of its object or change the | |||
| object to which it points during its lifetime. This means that making a copy of a const | |||
| ScopedPointer is impossible, as that would involve the new copy taking ownership from the | |||
| @@ -483,9 +483,9 @@ public: | |||
| private: | |||
| CharType* data; | |||
| static int findNullIndex (const CharType* const t) noexcept | |||
| static unsigned int findNullIndex (const CharType* const t) noexcept | |||
| { | |||
| int n = 0; | |||
| unsigned int n = 0; | |||
| while (t[n] != 0) | |||
| ++n; | |||
| @@ -352,7 +352,7 @@ public: | |||
| ++numExtraBytes; | |||
| } | |||
| *data++ = (CharType) ((0xff << (7 - numExtraBytes)) | (c >> (numExtraBytes * 6))); | |||
| *data++ = (CharType) ((uint32) (0xff << (7 - numExtraBytes)) | (c >> (numExtraBytes * 6))); | |||
| while (--numExtraBytes >= 0) | |||
| *data++ = (CharType) (0x80 | (0x3f & (c >> (numExtraBytes * 6)))); | |||
| @@ -605,7 +605,7 @@ public: | |||
| if (num > 1) | |||
| { | |||
| HeapBlock <XmlElement*> elems (num); | |||
| HeapBlock <XmlElement*> elems ((size_t) num); | |||
| getChildElementsAsArray (elems); | |||
| sortArray (comparator, (XmlElement**) elems, 0, num - 1, retainOrderOfEquivalentItems); | |||
| reorderChildElements (elems, num); | |||
| @@ -56,12 +56,12 @@ namespace PrimesHelpers | |||
| do | |||
| { | |||
| const int prime = (index << 1) + 1; | |||
| const unsigned int prime = ((unsigned int) index << 1) + 1; | |||
| BigInteger r (base), remainder; | |||
| r.divideBy (prime, remainder); | |||
| int i = prime - remainder.getBitRangeAsInt (0, 32); | |||
| unsigned int i = prime - remainder.getBitRangeAsInt (0, 32); | |||
| if (r.isZero()) | |||
| i += prime; | |||
| @@ -73,7 +73,7 @@ namespace PrimesHelpers | |||
| while (i < numBits) | |||
| { | |||
| result.setBit (i); | |||
| result.setBit ((int) i); | |||
| i += prime; | |||
| } | |||
| @@ -222,9 +222,9 @@ bool Primes::isProbablyPrime (const BigInteger& number, const int certainty) | |||
| if (number.getHighestBit() <= 10) | |||
| { | |||
| const int num = number.getBitRangeAsInt (0, 10); | |||
| const unsigned int num = number.getBitRangeAsInt (0, 10); | |||
| for (int i = num / 2; --i > 1;) | |||
| for (unsigned int i = num / 2; --i > 1;) | |||
| if (num % i == 0) | |||
| return false; | |||
| @@ -49,7 +49,7 @@ public: | |||
| count[1] += (uint32) (dataSize >> 29); | |||
| const size_t spaceLeft = 64 - bufferPos; | |||
| const size_t spaceLeft = 64 - (size_t) bufferPos; | |||
| size_t i = 0; | |||
| if (dataSize >= spaceLeft) | |||
| @@ -132,13 +132,13 @@ public: | |||
| encode (encodedLength, count, 8); | |||
| // Pad out to 56 mod 64. | |||
| const int index = (uint32) ((count[0] >> 3) & 0x3f); | |||
| const int index = (count[0] >> 3) & 0x3f; | |||
| const int paddingLength = (index < 56) ? (56 - index) | |||
| : (120 - index); | |||
| uint8 paddingBuffer[64] = { 0x80 }; // first byte is 0x80, remaining bytes are zero. | |||
| processBlock (paddingBuffer, paddingLength); | |||
| processBlock (paddingBuffer, (size_t) paddingLength); | |||
| processBlock (encodedLength, 8); | |||
| @@ -279,7 +279,7 @@ void MD5::processStream (InputStream& input, int64 numBytesToRead) | |||
| break; | |||
| numBytesToRead -= bytesRead; | |||
| generator.processBlock (tempBuffer, bytesRead); | |||
| generator.processBlock (tempBuffer, (size_t) bytesRead); | |||
| } | |||
| generator.finish (result); | |||
| @@ -77,7 +77,7 @@ public: | |||
| length += 64; | |||
| } | |||
| void processFinalBlock (const void* const data, int numBytes) noexcept | |||
| void processFinalBlock (const void* const data, unsigned int numBytes) noexcept | |||
| { | |||
| jassert (numBytes < 64); | |||
| @@ -126,7 +126,7 @@ public: | |||
| if (bytesRead < sizeof (buffer)) | |||
| { | |||
| processFinalBlock (buffer, bytesRead); | |||
| processFinalBlock (buffer, (unsigned int) bytesRead); | |||
| break; | |||
| } | |||
| @@ -170,8 +170,8 @@ public: | |||
| { | |||
| ++multiplier; | |||
| argb = ((multiplier * getAG()) & 0xff00ff00) | |||
| | (((multiplier * getRB()) >> 8) & 0x00ff00ff); | |||
| argb = ((((uint32) multiplier) * getAG()) & 0xff00ff00) | |||
| | (((((uint32) multiplier) * getRB()) >> 8) & 0x00ff00ff); | |||
| } | |||
| forcedinline void multiplyAlpha (const float multiplier) noexcept | |||
| @@ -315,7 +315,7 @@ public: | |||
| b = (uint8) (argb); | |||
| } | |||
| forcedinline uint32 getARGB() const noexcept { return 0xff000000 | b | (g << 8) | (r << 16); } | |||
| forcedinline uint32 getARGB() const noexcept { return 0xff000000 | b | (((uint32) g) << 8) | (((uint32) r) << 16); } | |||
| forcedinline uint32 getUnpremultipliedARGB() const noexcept { return getARGB(); } | |||
| forcedinline uint32 getRB() const noexcept { return b | (uint32) (r << 16); } | |||