third-party-mirrors/BipEmulator
1
0
Fork 0
mirror of https://github.com/freebip/BipEmulator.git synced 2025-05-20 17:41:20 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Оптимизация. Добавлен _memcmp

Browse Source
This commit is contained in:
freebipman 2020-08-16 20:05:25 +10:00
parent ad003776ae
commit 218c15c2d9
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BipEmulator.Host/ResImage.cs
View File

@ -49,8 +49,8 @@ namespace BipEmulator.Host
if (_paletteColors > 0) if (_paletteColors > 0)
ReadPalette(br); ReadPalette(br);
else if (_bitsPerPixel == 8 || _bitsPerPixel == 16 || _bitsPerPixel == 24 || _bitsPerPixel == 32) //else if (_bitsPerPixel == 8 || _bitsPerPixel == 16 || _bitsPerPixel == 24 || _bitsPerPixel == 32)
Debug.WriteLine("The image doesn't use a palette."); // Debug.WriteLine("The image doesn't use a palette.");
else else
throw new ArgumentException( throw new ArgumentException(
"The image format is not supported. Please report the issue on https://bitbucket.org/valeronm/amazfitbiptools"); "The image format is not supported. Please report the issue on https://bitbucket.org/valeronm/amazfitbiptools");
@ -60,21 +60,21 @@ namespace BipEmulator.Host
private void ReadHeader(BinaryReader br) private void ReadHeader(BinaryReader br)
{ {
Debug.WriteLine("Reading image header..."); //Debug.WriteLine("Reading image header...");
_width = br.ReadUInt16(); _width = br.ReadUInt16();
_height = br.ReadUInt16(); _height = br.ReadUInt16();
_rowLengthInBytes = br.ReadUInt16(); _rowLengthInBytes = br.ReadUInt16();
_bitsPerPixel = br.ReadUInt16(); _bitsPerPixel = br.ReadUInt16();
_paletteColors = br.ReadUInt16(); _paletteColors = br.ReadUInt16();
_transparency = br.ReadUInt16() > 0; _transparency = br.ReadUInt16() > 0;
Debug.WriteLine("Image header was read:"); //Debug.WriteLine("Image header was read:");
Debug.WriteLine("Width: {0}, Height: {1}, RowLength: {2}", _width, _height, _rowLengthInBytes); //Debug.WriteLine("Width: {0}, Height: {1}, RowLength: {2}", _width, _height, _rowLengthInBytes);
Debug.WriteLine("BPP: {0}, PaletteColors: {1}, Transaparency: {2}", _bitsPerPixel, _paletteColors, _transparency); //Debug.WriteLine("BPP: {0}, PaletteColors: {1}, Transaparency: {2}", _bitsPerPixel, _paletteColors, _transparency);
} }
private void ReadPalette(BinaryReader br) private void ReadPalette(BinaryReader br)
{ {
Debug.WriteLine("Reading palette..."); //Debug.WriteLine("Reading palette...");
_palette = new Color[_paletteColors]; _palette = new Color[_paletteColors];
for (var i = 0; i < _paletteColors; i++) for (var i = 0; i < _paletteColors; i++)
{ {
@ -86,10 +86,10 @@ namespace BipEmulator.Host
if (padding != 0) Debug.WriteLine("Palette item {0} last byte is not zero: {1:X2}", i, padding); if (padding != 0) Debug.WriteLine("Palette item {0} last byte is not zero: {1:X2}", i, padding);
var isColorValid = (r == 0 || r == 0xff) && (g == 0 || g == 0xff) && (b == 0 || b == 0xff); var isColorValid = (r == 0 || r == 0xff) && (g == 0 || g == 0xff) && (b == 0 || b == 0xff);
if (isColorValid) //if (isColorValid)
Debug.WriteLine("Palette item {0}: R {1:X2}, G {2:X2}, B {3:X2}", i, r, g, b); // Debug.WriteLine("Palette item {0}: R {1:X2}, G {2:X2}, B {3:X2}", i, r, g, b);
else //else
Debug.WriteLine("Palette item {0}: R {1:X2}, G {2:X2}, B {3:X2}, color isn't supported!", i, r, g, b); // Debug.WriteLine("Palette item {0}: R {1:X2}, G {2:X2}, B {3:X2}, color isn't supported!", i, r, g, b);
var alpha = _transparency && i == 0 ? 0x00 : 0xff; var alpha = _transparency && i == 0 ? 0x00 : 0xff;
_palette[i] = Color.FromArgb(alpha, r, g, b); _palette[i] = Color.FromArgb(alpha, r, g, b);

1
src/BipEmulator.Host/WatchScreen.cs
View File

@ -144,6 +144,7 @@ namespace BipEmulator.Host
private Color GetRealColor(Color color) private Color GetRealColor(Color color)
{ {
//return color;
switch ((uint)color.ToArgb()) switch ((uint)color.ToArgb())
{ {
// red // red

6
src/BipEmulator.Proxy/ProxyLib.cpp
View File

@ -445,6 +445,12 @@ int _memset(void* buf, int len, int val)
return (int)memset(buf, val, len); return (int)memset(buf, val, len);
} }
int _memcmp(const void* p1, const void* p2, int size)
{
return (int)memcmp(p1, p2, size);
}
int show_watchface() int show_watchface()
{ {
return 0; return 0;

3
src/BipEmulator.Proxy/libbip.h
View File

@ -215,7 +215,8 @@ int _memclr(void* buf, int len);
int _memcpy(void* dest, const void* srcptr, int num); int _memcpy(void* dest, const void* srcptr, int num);
// âñòðîåííàÿ â ïðîøèâêó ôóíêöèÿ memset // âñòðîåííàÿ â ïðîøèâêó ôóíêöèÿ memset
int _memset(void* buf, int len, int val); int _memset(void* buf, int len, int val);
// âñòðîåííàÿ â ïðîøèâêó ôóíêöèÿ memcmp
int _memcmp(const void* p1, const void* p2, int size);
int show_watchface(); int show_watchface();
void* get_ptr_temp_buf_2(); void* get_ptr_temp_buf_2();