mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-06 04:00:08 +00:00
Code Activity

Tidied up some minor compile warnings.

Browse source
This commit is contained in:
Julian Storer 2010-04-23 13:07:17 +01:00
parent 27506c2120
commit db657c04cd
32 changed files with 118 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

44
juce_amalgamated.cpp
View file

@ -168,11 +168,11 @@
#endif
#ifndef JUCE_FORCE_DEBUG
//#define JUCE_FORCE_DEBUG 1
#define JUCE_FORCE_DEBUG 0
#endif
#ifndef JUCE_LOG_ASSERTIONS
// #define JUCE_LOG_ASSERTIONS 1
#define JUCE_LOG_ASSERTIONS 0
#endif
#ifndef JUCE_ASIO
@ -180,7 +180,7 @@
#endif
#ifndef JUCE_WASAPI
// #define JUCE_WASAPI 1
#define JUCE_WASAPI 0
#endif
#ifndef JUCE_DIRECTSOUND
@ -192,7 +192,7 @@
#endif
#ifndef JUCE_JACK
#define JUCE_JACK 1
#define JUCE_JACK 0
#endif
#if ! (defined (JUCE_QUICKTIME) || JUCE_LINUX || JUCE_IPHONE || (JUCE_WINDOWS && ! JUCE_MSVC))
@ -220,15 +220,15 @@
#endif
#ifndef JUCE_USE_CDREADER
#define JUCE_USE_CDREADER 1
#define JUCE_USE_CDREADER 0
#endif
#if (JUCE_QUICKTIME || JUCE_WINDOWS) && ! defined (JUCE_USE_CAMERA)
// #define JUCE_USE_CAMERA 1
#define JUCE_USE_CAMERA 0
#endif
#ifndef JUCE_ENABLE_REPAINT_DEBUGGING
// #define JUCE_ENABLE_REPAINT_DEBUGGING 1
#define JUCE_ENABLE_REPAINT_DEBUGGING 0
#endif
#ifndef JUCE_USE_XINERAMA
@ -240,7 +240,7 @@
#endif
#ifndef JUCE_USE_XRENDER
//#define JUCE_USE_XRENDER 1
#define JUCE_USE_XRENDER 0
#endif
#ifndef JUCE_USE_XCURSOR
@ -248,15 +248,15 @@
#endif
#ifndef JUCE_PLUGINHOST_VST
// #define JUCE_PLUGINHOST_VST 1
#define JUCE_PLUGINHOST_VST 0
#endif
#ifndef JUCE_PLUGINHOST_AU
// #define JUCE_PLUGINHOST_AU 1
#define JUCE_PLUGINHOST_AU 0
#endif
#ifndef JUCE_ONLY_BUILD_CORE_LIBRARY
//#define JUCE_ONLY_BUILD_CORE_LIBRARY 1
#define JUCE_ONLY_BUILD_CORE_LIBRARY 0
#endif
#ifndef JUCE_WEB_BROWSER
@ -10189,7 +10189,7 @@ public:
static juce_wchar* createCopy (const char* const src, const size_t numChars)
{
juce_wchar* const dest = createUninitialised (numChars);
CharacterFunctions::copy (dest, src, numChars);
CharacterFunctions::copy (dest, src, (int) numChars);
dest [numChars] = 0;
return dest;
}
@ -87586,7 +87586,7 @@ Path::Path (const Path& other)
{
if (numElements > 0)
{
data.setAllocatedSize (numElements);
data.setAllocatedSize ((int) numElements);
memcpy (data.elements, other.data.elements, numElements * sizeof (float));
}
}
@ -87595,7 +87595,7 @@ Path& Path::operator= (const Path& other)
{
if (this != &other)
{
data.ensureAllocatedSize (other.numElements);
data.ensureAllocatedSize ((int) other.numElements);
numElements = other.numElements;
pathXMin = other.pathXMin;
@ -87694,7 +87694,7 @@ void Path::startNewSubPath (const float x, const float y)
pathYMax = jmax (pathYMax, y);
}
data.ensureAllocatedSize (numElements + 3);
data.ensureAllocatedSize ((int) numElements + 3);
data.elements [numElements++] = moveMarker;
data.elements [numElements++] = x;
@ -87708,7 +87708,7 @@ void Path::lineTo (const float x, const float y)
if (numElements == 0)
startNewSubPath (0, 0);
data.ensureAllocatedSize (numElements + 3);
data.ensureAllocatedSize ((int) numElements + 3);
data.elements [numElements++] = lineMarker;
data.elements [numElements++] = x;
@ -87729,7 +87729,7 @@ void Path::quadraticTo (const float x1, const float y1,
if (numElements == 0)
startNewSubPath (0, 0);
data.ensureAllocatedSize (numElements + 5);
data.ensureAllocatedSize ((int) numElements + 5);
data.elements [numElements++] = quadMarker;
data.elements [numElements++] = x1;
@ -87754,7 +87754,7 @@ void Path::cubicTo (const float x1, const float y1,
if (numElements == 0)
startNewSubPath (0, 0);
data.ensureAllocatedSize (numElements + 7);
data.ensureAllocatedSize ((int) numElements + 7);
data.elements [numElements++] = cubicMarker;
data.elements [numElements++] = x1;
@ -87775,14 +87775,14 @@ void Path::closeSubPath()
if (numElements > 0
&& data.elements [numElements - 1] != closeSubPathMarker)
{
data.ensureAllocatedSize (numElements + 1);
data.ensureAllocatedSize ((int) numElements + 1);
data.elements [numElements++] = closeSubPathMarker;
}
}
const Point<float> Path::getCurrentPosition() const
{
int i = numElements - 1;
size_t i = numElements - 1;
if (i > 0 && data.elements[i] == closeSubPathMarker)
{
@ -87815,7 +87815,7 @@ void Path::addRectangle (const float x, const float y,
if (h < 0)
swapVariables (y1, y2);
data.ensureAllocatedSize (numElements + 13);
data.ensureAllocatedSize ((int) numElements + 13);
if (numElements == 0)
{
@ -88545,7 +88545,7 @@ const Path Path::createPathWithRoundedCorners (const float cornerRadius) const
if (cornerRadius <= 0.01f)
return *this;
int indexOfPathStart = 0, indexOfPathStartThis = 0;
size_t indexOfPathStart = 0, indexOfPathStartThis = 0;
size_t n = 0;
bool lastWasLine = false, firstWasLine = false;
Path p;