1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-22 09:38:01 +02:00

Initial macOS changes

Many changes are related to fixing warnings
This commit is contained in:
Brian Fiete 2019-10-14 14:08:29 -07:00
parent 75f11b1459
commit 22ec4a86b8
52 changed files with 2873 additions and 266 deletions

View file

@ -488,7 +488,7 @@ void FFTShift1D(BFComplex* array, int size, int pitch, int dir)
for (int i = 0; i < size; i++)
array[i * pitch] = prev[((i + dir) % size)];
delete prev;
delete [] prev;
}
static void FFTShift2D(BFComplex* data, int cols, int rows)
@ -543,7 +543,7 @@ static void FFTConvert(ImageData* source)
source->mBits[i] = 0xFF000000 | val | (val << 8) | (val << 16);
}
delete fFTLog;
delete [] fFTLog;
delete [] nums;
}
@ -563,7 +563,7 @@ void DCT_1D(double* array, int size, int pitch)
array[idxOut*pitch] = 0.5 * scale * val;
}
delete prev;
delete [] prev;
}
void IDCT_1D(double* array, int size, int pitch)
@ -583,7 +583,7 @@ void IDCT_1D(double* array, int size, int pitch)
array[idxOut*pitch] = 0.5 * val;
}
delete prev;
delete [] prev;
}
const int DCT_1D_I_TABLE[64] =
@ -619,7 +619,7 @@ void DCT_1D_I(int* array, int size, int pitch)
}
delete prev;
delete [] prev;
}
const int IDCT_1D_I_TABLE[64] =

View file

@ -85,7 +85,7 @@ bool ImageData::LoadFromFile(const StringImpl& path)
int size = 0;
uint8* aData = LoadBinaryData(path, &size);
if (aData == NULL)
return NULL;
return false;
SetSrcData(aData, size);
bool result = ReadData();
if (mKeepSrcDataValid)

View file

@ -441,7 +441,7 @@ void SoftBlur(uint32* data, int w, int h, float radius, uint32 defaultValue)
BoxBlur(tempBuffer, data, h, w, d, defaultValue);
}
}
delete tempBuffer;
delete [] tempBuffer;
}
static int gAlphaCheckOfs [][2] =
@ -1705,7 +1705,7 @@ void ChokedPixelTransform(ImageData* src, ImageData* dest, float radius, float c
}
}
delete tempBuffer;
delete [] tempBuffer;
}
void ImageOuterGlowEffect::Apply(PSDLayerInfo* layerInfo, ImageData* imageData, ImageData* destImageData)
@ -2251,7 +2251,7 @@ void ImageBevelEffect::Apply(int pass, int style, PSDLayerInfo* layerInfo, Image
}
}
delete normalMap;
delete [] normalMap;
}
void ImageBevelEffect::Apply(ImageEffectCtx* ctx)

View file

@ -152,7 +152,7 @@ public:
public:
virtual void Init() override;
virtual void CreateContourAndGradientData();
virtual int GetNeededBorderSize();
virtual int GetNeededBorderSize() override;
};
class ImageOuterGlowEffect : public ImageGlowEffect
@ -266,9 +266,9 @@ public:
void Init() override;
void Apply(PSDLayerInfo* layerInfo, ImageData* imageData, ImageData* destImageData) override;
virtual void Apply(ImageEffectCtx* ctx) override;
virtual int GetMixType();
virtual int GetMixType() override;
void Apply(int pass, int style, PSDLayerInfo* layerInfo, ImageData* imageData, ImageData* hiliteImage, ImageData* shadowImage);
virtual int GetNeededBorderSize();
virtual int GetNeededBorderSize() override;
};
typedef std::vector<BaseImageEffect*> ImageEffectVector;
@ -286,10 +286,10 @@ public:
bool mInvert;
public:
virtual void Init();
virtual void Init() override;
virtual void Apply(PSDLayerInfo* layerInfo, ImageData* imageData, ImageData* destImageData) override;
virtual int GetMixType(); // Default:Interior
virtual int GetNeededBorderSize();
virtual int GetMixType() override; // Default:Interior
virtual int GetNeededBorderSize() override;
};
class ImageColorOverlayEffect : public BaseImageEffect
@ -334,8 +334,8 @@ public:
public:
virtual void Apply(PSDLayerInfo* layerInfo, ImageData* imageData, ImageData* destImageData) override;
virtual void Apply(ImageEffectCtx* ctx) override;
virtual int GetMixType(); // Default:Interior
virtual int GetNeededBorderSize();
virtual int GetMixType() override; // Default:Interior
virtual int GetNeededBorderSize() override;
virtual bool NeedsOrigBits(ImageEffects* effects) override;
};

View file

@ -1907,12 +1907,12 @@ bool PSDLayerInfo::ReadData()
}
}
delete rowData;
delete [] rowData;
}
}
}
delete rowLengths;
delete [] rowLengths;
if (((mLayerMask != NULL) || (mVectorMask != NULL)) && (!mLayerMaskHidesEffects))
ApplyMask(this);