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

plugin/ppm: Fixed condition

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15001 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-09-09 10:18:37 +00:00
parent 20a8a9039e
commit 7bec26bd36
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlCore/Win32Wnd.cpp
View file

@ -1279,9 +1279,6 @@ Rect Ctrl::GetScreenClient(HWND hwnd)
}
Rect Ctrl::GetDefaultWindowRect() {
#ifdef PLATFORM_WINCE
return Rect(0, 0, 100, 100);
#else
HWND hwnd = ::CreateWindow("UPP-CLASS-A", "", WS_OVERLAPPED,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL, NULL, NULL, NULL);
@ -1294,7 +1291,6 @@ Rect Ctrl::GetDefaultWindowRect() {
else
sr = RectC(20, 20, 500, 350);
return sr;
#endif
}
TopFrameDraw::TopFrameDraw(Ctrl *ctrl, const Rect& r)

4
uppsrc/plugin/ppm/ppm.cpp
View file

@ -24,12 +24,12 @@ bool PPMRaster::Create()
CParser p(h);
size.cx = p.ReadInt();
size.cy = p.ReadInt();
if(size.cx <= 0 && size.cx > 99999 || size.cy <= 0 || size.cy >= 99999)
if(size.cx <= 0 || size.cx > 99999 || size.cy <= 0 || size.cy >= 99999)
return false;
h = stream.GetLine();
CParser p1(h);
int maxval = p1.ReadInt();
if(maxval <= 0 && maxval > 65535)
if(maxval <= 0 || maxval > 65535)
return false;
is16 = maxval > 255;
pixel_pos = stream.GetPos();