Browse Source

fix for javascript parameter order in IE browser plugins; fix for linux x64 icons

tags/2021-05-28
jules 16 years ago
parent
commit
c94bd62519
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      build/linux/platform_specific_code/juce_linux_Windowing.cpp
  2. +2
    -2
      extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp
  3. +1
    -1
      juce_amalgamated.cpp

+ 1
- 1
build/linux/platform_specific_code/juce_linux_Windowing.cpp View File

@@ -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();


+ 2
- 2
extras/browser plugins/wrapper/juce_ActiveX_GlueCode.cpp View File

@@ -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);


+ 1
- 1
juce_amalgamated.cpp View File

@@ -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();


Loading…
Cancel
Save