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

gui_sizeof merged, double formatting precsion in JSON/XML reduced to 15 digits

Browse source
This commit is contained in:
Mirek Fidler 2022-06-03 11:43:48 +02:00
commit 0449296f07
93 changed files with 3268 additions and 1789 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Draw/Draw.h
View file

@ -36,7 +36,7 @@ class FontInfo;
inline
bool PreferColorEmoji(int c)
{ // for these codepoints we prefer replacemnet color emoji even if glyphs is in the font
{ // for these codepoints we prefer replacement color emoji even if glyphs is in the font
return c >= 0x2600 && c <= 0x27ef || c >= 0x1f004 && c <= 0x1f251 || c >= 0x1f300 && c <= 0x1faf6;
}
@ -211,6 +211,8 @@ public:
operator Value() const { return RichToValue(*this); }
Font(const Value& q) { *this = q.Get<Font>(); }
static Font FromInt64(int64 q) { Font fnt; fnt.data = q; return fnt; }
// BW compatibility
FontInfo Info() const;

2
uppsrc/Draw/Image.cpp
View file

@ -234,6 +234,8 @@ void Image::Serialize(Stream& s)
p2 = spot2;
s % p2;
}
if(sz.cx < 0 || sz.cy < 0)
s.LoadError();
int64 len = (int64)sz.cx * (int64)sz.cy * (int64)sizeof(RGBA);
if(s.IsLoading()) {
if(len) {