diff --git a/build/linux/platform_specific_code/juce_linux_Windowing.cpp b/build/linux/platform_specific_code/juce_linux_Windowing.cpp index 7b6f4ab7c9..8bb4c36f89 100644 --- a/build/linux/platform_specific_code/juce_linux_Windowing.cpp +++ b/build/linux/platform_specific_code/juce_linux_Windowing.cpp @@ -1159,7 +1159,7 @@ public: void setIcon (const Image& newIcon) { const int dataSize = newIcon.getWidth() * newIcon.getHeight() + 2; - uint32* const data = (uint32*) juce_malloc (dataSize * sizeof (uint32)); + unsigned long* const data = (unsigned long*) juce_malloc (dataSize * sizeof (uint32)); int index = 0; data[index++] = newIcon.getWidth(); diff --git a/extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp b/extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp index 34c8a5013a..945439297f 100644 --- a/extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp +++ b/extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp @@ -143,7 +143,7 @@ public: { var* args = (var*) juce_calloc (sizeof (var) * numArgs); for (int j = 0; j < numArgs; ++j) - args[j] = variantTojuceVar (pDispParams->rgvarg[j]); + args[(numArgs - 1) - j] = variantTojuceVar (pDispParams->rgvarg[j]); result = v.invoke (memberId, args, numArgs); @@ -349,7 +349,7 @@ public: VARIANT* params = (VARIANT*) juce_calloc (sizeof (VARIANT) * (numParameters + 1)); for (int i = 0; i < numParameters; ++i) - juceVarToVariant (parameters[i], params[i]); + juceVarToVariant (parameters[(numParameters - 1) - i], params[i]); DISPPARAMS dispParams; zerostruct (dispParams); diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 5b2122817e..407fab288c 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -263748,7 +263748,7 @@ public: void setIcon (const Image& newIcon) { const int dataSize = newIcon.getWidth() * newIcon.getHeight() + 2; - uint32* const data = (uint32*) juce_malloc (dataSize * sizeof (uint32)); + unsigned long* const data = (unsigned long*) juce_malloc (dataSize * sizeof (uint32)); int index = 0; data[index++] = newIcon.getWidth();