diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-07-10 03:30:06 +0400 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-07-10 03:30:06 +0400 |
| commit | 642ae654c734c47c5517c3282c9ebb3865b139f9 (patch) | |
| tree | e2d0a67dc1ea295118ca22e303c37c4b67106dd7 /include | |
| parent | 26f612a5331749f8ed04be68ba777a58480fd6c0 (diff) | |
| parent | b013ab51c8860e763a9f0a14201679b4c2eff54e (diff) | |
Merge branch 'master' of tls01:/home/git/sw/NeutrinoRDP
Conflicts:
libfreerdp-core/rdp.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/freerdp/codec/bitmap.h | 12 | ||||
| -rw-r--r-- | include/freerdp/freerdp.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/freerdp/codec/bitmap.h b/include/freerdp/codec/bitmap.h index 29f412f..4b20b1a 100644 --- a/include/freerdp/codec/bitmap.h +++ b/include/freerdp/codec/bitmap.h @@ -22,6 +22,18 @@ #include <freerdp/types.h> +struct bitmap_extra +{ + uint8* temp; + int flags; + int pad0; + int pad1; + int pad2; +}; + +typedef struct bitmap_extra bitmapExtra; + FREERDP_API tbool bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp); +FREERDP_API tbool bitmap_decompress_ex(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp, bitmapExtra* be); #endif /* __BITMAP_H */ diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index e81b360..3ac773c 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -73,6 +73,7 @@ struct rdp_context rdpChannels* channels; /* 36 */ rdpGraphics* graphics; /* 37 */ uint32 paddingC[64 - 38]; /* 38 */ + uint8 temp[32 * 1024]; }; struct rdp_freerdp |