Marc-André Moreau
067da290dd
Merge pull request #2027 from akallabeth/winpr-log
...
Replace stdout and logging defines with WLog, add logcat support
2014-08-11 10:38:28 -04:00
Marc-André Moreau
cff9c16c1e
Merge branch 'master' of github.com:FreeRDP/FreeRDP
...
Conflicts:
channels/disp/client/disp_main.c
2014-08-11 10:36:07 -04:00
Marc-André Moreau
51ac7fffbd
Merge pull request #1993 from bmiklautz/merge/from-stable-1.1
...
Pick changes from stable-1.1 that are not yet on master
2014-08-11 10:28:10 -04:00
Armin Novak
d0c5d9bb9e
Fixed missing include.
2014-08-11 09:49:57 +02:00
Armin Novak
784696c1cd
Fixed missing includes and invalid replacement.
2014-08-11 09:38:08 +02:00
Armin Novak
8d8719e101
Replaced fprintf with DEBUG_WARN
2014-08-11 09:19:47 +02:00
Armin Novak
bcb5f90ee6
Replaced perror with DEBUG_WARN
2014-08-11 09:19:23 +02:00
Armin Novak
2436e41e63
Fixed warnings for comm tests.
2014-08-11 09:17:56 +02:00
Armin Novak
66b8905ac6
Using special log defines for channels now.
2014-08-11 09:12:01 +02:00
Marc-André Moreau
6c85505ecc
libwinpr-synch: replace pthreads-based barrier implementation by interlocked operations + event and avoid deadlocks
2014-08-08 21:02:15 -04:00
Marc-André Moreau
54264936d1
shadow: improve synchronization barrier usage
2014-08-08 20:51:26 -04:00
Rene Rheaume
4b17230210
Merge remote-tracking branch 'upstream/master'
2014-08-08 20:18:44 -04:00
Rene Rheaume
47d779f6a0
Changed back the permissions to previous values
2014-08-08 20:14:56 -04:00
Rene Rheaume
15ad357e1a
Recompressed images with FileOptimizer 6.8 (an open-source mass file recompression tool for Windows)
2014-08-08 20:12:25 -04:00
Marc-André Moreau
8b4cf07c8a
shadow: make use of synchronization barrier
2014-08-08 18:47:46 -04:00
Marc-André Moreau
edde16e9d5
libwinpr-synch: add initial synchronization barrier implementation
2014-08-08 17:34:30 -04:00
Benoit LeBlanc
b990c2002a
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
2014-08-08 11:42:53 -04:00
erbth
a8945306a1
Merge branch 'egfx' of https://github.com/awakecoding/freerdp into egfx
2014-08-08 15:22:47 +02:00
erbth
a8257b5201
fixed some memory leaks arround DVC and RDPEGFX
2014-08-08 15:19:49 +02:00
Bernhard Miklautz
cd974e874a
Merge pull request #2028 from v00d00/update-codecid
...
tmsf: CODEC_ID_* -> AV_CODEC_ID_*
2014-08-08 15:06:48 +02:00
Ian Whyman
8eb7f69a12
Backwards compat defines
2014-08-08 13:05:06 +01:00
Ian Whyman
f73e40d188
CODEC_ID_* -> AV_CODEC_ID_*
2014-08-08 09:05:03 +01:00
Armin Novak
0780c0993e
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:21:07 +02:00
Armin Novak
084da200cf
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:53 +02:00
Armin Novak
b897c6a433
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:35 +02:00
Armin Novak
b97099e815
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:13 +02:00
Armin Novak
e6ed76977a
DEBUG_PRINT now a define, resolves linking issues.
...
Using log name as logcat tag now.
Removed log name from default android log formatting.
2014-08-07 21:51:52 +02:00
Armin Novak
eecc8e2333
Removed debug.c
2014-08-07 21:38:11 +02:00
Pavel Tsekov
052173de5f
Do not assume 32bpp framebuffer when flipping NSCodec bitmaps.
...
* libfreerdp/gdi/gdi.c (gdi_surface_bits): Do not assume 32bpp
framebuffer when flipping NSCodec compressed bitmaps.
2014-08-07 20:37:06 +03:00
Pavel Tsekov
adb750f7ca
Convert NSCodec compressed bitmaps to framebuffer format.
...
* libfreerdp/gdi/gdi.c (gdi_surface_bits): Convert NSCodec compressed
bitmaps to framebuffer format.
2014-08-07 20:33:30 +03:00
Armin Novak
158e1323de
Fixed compiler warnings.
2014-08-07 19:05:48 +02:00
Armin Novak
f00cb3d25c
Reverted previous replacements, not to be done for tests.
2014-08-07 19:05:22 +02:00
Marc-André Moreau
fdab87cba0
shadow: improve invalid region detection
2014-08-07 12:36:45 -04:00
Armin Novak
a27706d129
Fixed missing includes.
2014-08-07 18:25:43 +02:00
Armin Novak
1a37435a26
Added redirection of ConsoleAppender to logcat, if used on android.
...
Using custom default format for log messages on android.
2014-08-07 17:47:59 +02:00
Armin Novak
219a760bad
Fixed logging, now using log functions.
2014-08-07 17:31:42 +02:00
Armin Novak
b252009d36
Replaced custom logging mechanism with WLog wrapper.
2014-08-07 16:51:49 +02:00
Armin Novak
f4c133eaf8
Replaced custom logging mechanism with WLog wrapper.
2014-08-07 16:51:24 +02:00
Rene Rheaume
0d2a3d2e2f
Fixed a typo for conditional compilation
2014-08-07 07:11:04 -04:00
Rene Rheaume
223a9f6124
futimens, while being POSIX-compliant, does not exist on Mac OS X. Added futimes back to address this.
2014-08-07 06:47:33 -04:00
Rene Rheaume
151e5de3d4
Recompressed PNG images again
2014-08-06 23:10:23 -04:00
Rene Rheaume
281ab78481
Recompressed losslessy PNG and JPEG images
2014-08-06 22:37:14 -04:00
Rene Rheaume
5f9c36da5d
* Use futimens that is POSIX-compliant and compatible with uclibc instead of futimes.
...
* Borrowed eventfd_read and eventfd_write from bionic for uclibc compatibility (uclibc headers are broken unfortunately). Bionic and
FreeRDP are both under the Apache 2.0 license.
2014-08-06 22:06:01 -04:00
Pavel Tsekov
98cf129a11
Do not invert fb contents when in 32bpp mode
...
* client/Android/FreeRDPCore/jni/android_freerdp.c:
(android_post_connect): Pass the proper flags to gdi_init().
(copy_pixel_buffer): Do not invert the framebuffer data when using 32bpp
framebuffer.
2014-08-07 01:12:39 +03:00
Pavel Tsekov
c51c5df2ff
* include/freerdp/codec/color.h:
...
(freerdp_color_convert_drawing_order_color_to_gdi_color): Declare new
function.
* libfreerdp/codec/color.c:
(freerdp_color_convert_drawing_order_color_to_gdi_color): Implement.
(freerdp_image_convert_8bpp): Properly use the ARGB32/ABGR32/RGB32/BGR32
macros when converting 8bpp data to 32bpp.
(freerdp_image_convert_32bpp): Fix CLRCONV_ALPHA and CLRCONV_INVERT
processing for 32bpp destination.
(freerdp_mono_image_convert): Use ARGB32/ABGR32 when converting to 32bpp
and CLRCONV_ALPHA is set.
* libfreerdp/core/orders.c: Color data from drawing orders is
interpreted in big endian mode.
* libfreerdp/core/update.c (update_read_palette): Likewise.
* libfreerdp/gdi/16bpp.c (gdi_get_color_16bpp): GDI colors are stored as
RGB now.
* libfreerdp/gdi/32bpp.c (gdi_get_color_32bpp): Likewise.
* libfreerdp/gdi/gdi.c:
Use freerdp_color_convert_drawing_order_color_to_gdi_color() to convert
from drawing order color representation to GDI color representation
troughout.
* libfreerdp/gdi/graphics.c (gdi_Glyph_BeginDraw): Likewise.
(gdi_Glyph_EndDraw): Likewise.
2014-08-07 00:58:58 +03:00
Marc-André Moreau
d9d9bf3609
shadow: start detecting invalid regions manually
2014-08-06 17:51:38 -04:00
Benoît LeBlanc
1f2f9dfbdc
fix gdi_resize: set primary_buffer to NULL to avoid use after free
2014-08-06 17:02:21 -04:00
Marc-André Moreau
4f41f03ad7
shadow: fix X11 non-XShm support
2014-08-06 14:18:34 -04:00
Marc-André Moreau
9838200068
libfreerdp-core: fix unix domain socket support
2014-08-06 12:08:00 -04:00
Marc-André Moreau
2653c5420f
libfreerdp-codec: start processing tiles in progressive rfx
2014-08-06 10:23:14 -04:00