github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-09 03:24:59 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Draw: Fixed warnings in Blur, ide: Fixed internal compiler paths with clang

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14377 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-25 07:03:33 +00:00
parent ac5db267e5
commit a2d5520e8c
3 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

48
uppsrc/Draw/ImageOp.cpp
View file

@ -991,27 +991,27 @@ Image GaussianBlur(const Image& img, int radius, bool co)
for(int j = 0; j <= r; j++) {
const RGBA& p = src[i][ri++];
RGBA& q = tmp[i][ti++];
q.r = (rsum += p.r - fv.r) * avg;
q.g = (gsum += p.g - fv.g) * avg;
q.b = (bsum += p.b - fv.b) * avg;
q.a = (asum += p.a - fv.a) * avg;
q.r = byte((rsum += p.r - fv.r) * avg);
q.g = byte((gsum += p.g - fv.g) * avg);
q.b = byte((bsum += p.b - fv.b) * avg);
q.a = byte((asum += p.a - fv.a) * avg);
}
for(int j = r + 1; j < sz.cx - r; j++) {
const RGBA& p = src[i][ri++];
const RGBA& q = src[i][li++];
RGBA& t = tmp[i][ti++];
t.r = (rsum += p.r - q.r) * avg;
t.g = (gsum += p.g - q.g) * avg;
t.b = (bsum += p.b - q.b) * avg;
t.a = (asum += p.a - q.a) * avg;
t.r = byte((rsum += p.r - q.r) * avg);
t.g = byte((gsum += p.g - q.g) * avg);
t.b = byte((bsum += p.b - q.b) * avg);
t.a = byte((asum += p.a - q.a) * avg);
}
for(int j = sz.cx - r; j < sz.cx ; j++) {
const RGBA& p = src[i][li++];
RGBA& q = tmp[i][ti++];
q.r = (rsum += lv.r - p.r) * avg;
q.g = (gsum += lv.g - p.g) * avg;
q.b = (bsum += lv.b - p.b) * avg;
q.a = (asum += lv.a - p.a) * avg;
q.r = byte((rsum += lv.r - p.r) * avg);
q.g = byte((gsum += lv.g - p.g) * avg);
q.b = byte((bsum += lv.b - p.b) * avg);
q.a = byte((asum += lv.a - p.a) * avg);
}
};
@ -1042,27 +1042,27 @@ Image GaussianBlur(const Image& img, int radius, bool co)
for(int j = 0; j <= r; j++) {
const RGBA& p = tmp[ri++][i];
RGBA& q = out[ti++][i];
q.r = (rsum += p.r - fv.r) * avg;
q.g = (gsum += p.g - fv.g) * avg;
q.b = (bsum += p.b - fv.b) * avg;
q.a = (asum += p.a - fv.a) * avg;
q.r = byte((rsum += p.r - fv.r) * avg);
q.g = byte((gsum += p.g - fv.g) * avg);
q.b = byte((bsum += p.b - fv.b) * avg);
q.a = byte((asum += p.a - fv.a) * avg);
}
for(int j = r + 1; j < sz.cy - r; j++) {
const RGBA& p = tmp[ri++][i];
const RGBA& q = tmp[li++][i];
RGBA& t = out[ti++][i];
t.r = (rsum += p.r - q.r) * avg;
t.g = (gsum += p.g - q.g) * avg;
t.b = (bsum += p.b - q.b) * avg;
t.a = (asum += p.a - q.a) * avg;
t.r = byte((rsum += p.r - q.r) * avg);
t.g = byte((gsum += p.g - q.g) * avg);
t.b = byte((bsum += p.b - q.b) * avg);
t.a = byte((asum += p.a - q.a) * avg);
}
for(int j = sz.cy - r; j < sz.cy; j++) {
const RGBA& p = tmp[li++][i];
RGBA& q = out[ti++][i];
q.r = (rsum += lv.r - p.r) * avg;
q.g = (gsum += lv.g - p.g) * avg;
q.b = (bsum += lv.b - p.b) * avg;
q.a = (asum += lv.a - p.a) * avg;
q.r = byte((rsum += lv.r - p.r) * avg);
q.g = byte((gsum += lv.g - p.g) * avg);
q.b = byte((bsum += lv.b - p.b) * avg);
q.a = byte((asum += lv.a - p.a) * avg);
}
};

6
uppsrc/ide/Builders/MscBuilder.cpp
View file

@ -279,10 +279,10 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
String cc_size = cc;
String cc_speed = cc;
if(!release)
cc << "d " << debug_options;
else
if(release)
cc << ' ' << release_options;
else
cc << "d " << debug_options;
int recompile = 0;
Blitz b;

13
uppsrc/ide/Methods.cpp
View file

@ -843,10 +843,10 @@ String Ide::GetIncludePath()
MergeWith(include, ";", sys_includes);
#endif
#ifdef PLATFORM_WIN32
static VectorMap<String, String> mingw_include;
int q = mingw_include.Find(method);
static VectorMap<String, String> clang_include;
int q = clang_include.Find(method);
if(q < 0) {
String gcc = GetFileOnPath("gcc.exe", bm.Get("PATH", "")); // TODO clang
String gcc = GetFileOnPath("clang.exe", bm.Get("PATH", "")); // TODO clang
Index<String> r;
if(gcc.GetCount()) {
String dummy = ConfigFile("dummy.cpp");
@ -861,11 +861,12 @@ String Ide::GetIncludePath()
String out;
if(p.Start(gcc + " -v -x c++ -E " + dummy, environment) && p.Finish(out) == 0)
ExtractIncludes(r, out);
DeleteFile(dummy);
}
q = mingw_include.GetCount();
mingw_include.Add(method, Join(r.GetKeys(), ";"));
q = clang_include.GetCount();
clang_include.Add(method, Join(r.GetKeys(), ";"));
}
MergeWith(include, ";", mingw_include[q]);
MergeWith(include, ";", clang_include[q]);
#endif
if(findarg(bm.Get("BUILDER", ""), "ANDROID") >= 0) {
AndroidNDK ndk(bm.Get("NDK_PATH", ""));