diff --git a/src/ebsynth_cpu.cpp b/src/ebsynth_cpu.cpp index 5fd89cc..ca6716a 100644 --- a/src/ebsynth_cpu.cpp +++ b/src/ebsynth_cpu.cpp @@ -4,12 +4,17 @@ #include "ebsynth.h" #include "jzq.h" -#include "omp.h" #include #include #include +#ifdef __APPLE__ + #include +#else + #include +#endif + #define FOR(A,X,Y) for(int Y=0;Y minTileHeight ? numThreads_ : std::max(int(ceil(float(sizeA(1))/float(minTileHeight))),1); const int tileHeight = sizeA(1)/numTiles; const float omegaBest = (float(sizeA(0)*sizeA(1)) / float(sizeB(0)*sizeB(1))) * float(patchWidth*patchWidth); - A2i Omega(sizeB); + fill(&Omega,(int)0); for(int y=0;y> NNF; //Array2> NNF2; Array2 E; - //Array2 Omega; + Array2 Omega; }; std::vector pyramid(levelCount); @@ -727,7 +750,7 @@ void ebsynthCpu(int numStyleChannels, //pyramid[level].mask2 = Array2(levelTargetSize); pyramid[level].NNF = Array2>(levelTargetSize); //pyramid[level].NNF2 = Array2>(levelTargetSize); - //pyramid[level].Omega = Array2(levelSourceSize); + pyramid[level].Omega = Array2(levelSourceSize); pyramid[level].E = Array2(levelTargetSize); if (level(); //pyramid[level].mask2 = Array2(); //pyramid[level].NNF2 = Array2>(); - //pyramid[level].Omega = Array2(); + pyramid[level].Omega = Array2(); pyramid[level].E = Array2(); if (targetModulationData) { pyramid[level].targetModulation = Array2>(); } }