github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12131 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-08-01 07:37:22 +00:00
parent 5f0c0bcd30
commit ce1b5d1d7d
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/IconDes/Image.cpp
View file

@ -153,7 +153,6 @@ void IconDes::SmoothRescale()
Slot& c = Current(); Slot& c = Current();
BeginTransform(); BeginTransform();
Image bk = IsPasting() ? c.paste_image : c.image; Image bk = IsPasting() ? c.paste_image : c.image;
int r = c.paste_image.GetResolution();
dlg.cx <<= bk.GetWidth(); dlg.cx <<= bk.GetWidth();
dlg.cy <<= bk.GetHeight(); dlg.cy <<= bk.GetHeight();
dlg.keep <<= true; dlg.keep <<= true;

5
uppsrc/IconDes/List.cpp
View file

@ -384,6 +384,7 @@ void IconDes::EditImage()
int r = c.image.GetResolution(); int r = c.image.GetResolution();
c.image = CreateImage(Size(minmax((int)~dlg.cx, 1, 8192), minmax((int)~dlg.cy, 1, 8192)), Null); c.image = CreateImage(Size(minmax((int)~dlg.cx, 1, 8192), minmax((int)~dlg.cy, 1, 8192)), Null);
UPP::Copy(c.image, Point(0, 0), img, img.GetSize()); UPP::Copy(c.image, Point(0, 0), img, img.GetSize());
SetRes(c.image, r);
Reset(); Reset();
} }
} }
@ -482,9 +483,7 @@ int IconDes::GetCount() const
Image IconDes::GetImage(int ii) const Image IconDes::GetImage(int ii) const
{ {
const Slot& c = slot[ii]; return slot[ii].image;
Image m = slot[ii].image;
return m;
} }
String IconDes::GetName(int ii) const String IconDes::GetName(int ii) const

8
uppsrc/TextDiffCtrl/TextDiff.cpp
View file

@ -145,7 +145,7 @@ bool TextComparator::Find(int start1, int end1, int start2, int end2, int& best_
int last = max(best_count - chunk + 1, 0); int last = max(best_count - chunk + 1, 0);
const HashBase *hp1 = &hash1[lvl]; const HashBase *hp1 = &hash1[lvl];
const HashBase *hp2 = &hash2[lvl]; const HashBase *hp2 = &hash2[lvl];
const unsigned *h1 = hp1->Begin() + start1; const unsigned *h1 = hp1->begin() + start1;
int i = hp2->Find(*h1); int i = hp2->Find(*h1);
while(i >= 0) while(i >= 0)
@ -154,8 +154,8 @@ bool TextComparator::Find(int start1, int end1, int start2, int end2, int& best_
else { else {
if(i >= start2 && h1[last] == (*hp2)[i + last]) { if(i >= start2 && h1[last] == (*hp2)[i + last]) {
int top = min(len1, end2 - i); int top = min(len1, end2 - i);
int hc = CompareGetCount(h1, hp2->Begin() + i, top) + chunk - 1; int hc = CompareGetCount(h1, hp2->begin() + i, top) + chunk - 1;
int cnt = CompareGetCount(f1, file2.Begin() + i, min(hc, top)); int cnt = CompareGetCount(f1, file2.begin() + i, min(hc, top));
if(cnt > best_count) { if(cnt > best_count) {
best_count = cnt; best_count = cnt;
best_match = i; best_match = i;
@ -168,7 +168,7 @@ bool TextComparator::Find(int start1, int end1, int start2, int end2, int& best_
last = best_count - chunk + 1; last = best_count - chunk + 1;
hp1 = &hash1[lvl]; hp1 = &hash1[lvl];
hp2 = &hash2[lvl]; hp2 = &hash2[lvl];
h1 = hp1->Begin() + start1; h1 = hp1->begin() + start1;
int oi = i; int oi = i;
for(i = hp2->Find(*h1); i >= 0 && i <= oi; i = hp2->FindNext(i)) for(i = hp2->Find(*h1); i >= 0 && i <= oi; i = hp2->FindNext(i))
; ;