Removed remaining printf and DEBUG_* usages.

diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c
index 408837d..95f9067 100644 (file)
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -419,7 +419,7 @@ void wf_gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmapUpdate)
 
                        if (status < 0)
                        {
-                               DEBUG_WARN("wf_gdi_bitmap_update: bitmap decompression failure\n");
+                               WLog_ERR(TAG, "bitmap decompression failure");
                                return;
                        }
 

diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c
index e5571fc..6a62a37 100644 (file)
--- a/libfreerdp/cache/bitmap.c
+++ b/libfreerdp/cache/bitmap.c
@@ -29,9 +29,11 @@
 #include <freerdp/constants.h>
 #include <winpr/stream.h>
 
-#include <freerdp/utils/debug.h>
+#include <freerdp/log.h>
 #include <freerdp/cache/bitmap.h>
 
+#define TAG FREERDP_TAG("cache.bitmap")
+
 void update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt)
 {
        rdpBitmap* bitmap;

diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c
index c01a0de..a7a7db4 100644 (file)
--- a/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@ -563,7 +563,7 @@ void gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmapUpdate)
 
                        if (status < 0)
                        {
-                               DEBUG_WARN("gdi_bitmap_update: bitmap decompression failure\n");
+                               WLog_ERR(TAG, "bitmap decompression failure");
                                return;
                        }
 

diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c
index 5b7638a..b7cff01 100644 (file)
--- a/libfreerdp/gdi/gfx.c
+++ b/libfreerdp/gdi/gfx.c
@@ -21,9 +21,12 @@
 #include "config.h"
 #endif
 
+#include <freerdp/log.h>
 #include <freerdp/gdi/gfx.h>
 #include <freerdp/gdi/region.h>
 
+#define TAG FREERDP_TAG("gdi")
+
 int gdi_ResetGraphics(RdpgfxClientContext* context, RDPGFX_RESET_GRAPHICS_PDU* resetGraphics)
 {
        rdpGdi* gdi = (rdpGdi*) context->custom;
@@ -259,7 +262,7 @@ int gdi_SurfaceCommand_ClearCodec(rdpGdi* gdi, RdpgfxClientContext* context, RDP
 
        if (status < 0)
        {
-               printf("clear_decompress failure: %d\n", status);
+               WLog_ERR(TAG, "clear_decompress failure: %d", status);
                return -1;
        }
 
@@ -342,7 +345,7 @@ int gdi_SurfaceCommand_H264(rdpGdi* gdi, RdpgfxClientContext* context, RDPGFX_SU
 
        if (status < 0)
        {
-               printf("h264_decompress failure: %d\n",status);
+               WLog_ERR(TAG, "h264_decompress failure: %d",status);
                return -1;
        }
 
@@ -370,7 +373,7 @@ int gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, RDPGFX_S
        if (!surface)
                return -1;
 
-       printf("gdi_SurfaceCommand_Alpha: status: %d\n", status);
+       WLog_DBG(TAG, "gdi_SurfaceCommand_Alpha: status: %d", status);
 
        /* fill with green for now to distinguish from the rest */
 
@@ -425,7 +428,7 @@ int gdi_SurfaceCommand_Progressive(rdpGdi* gdi, RdpgfxClientContext* context, RD
 
        if (status < 0)
        {
-               printf("progressive_decompress failure: %d\n", status);
+               WLog_ERR(TAG, "progressive_decompress failure: %d", status);
                return -1;
        }
 

diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c
index 179f5aa..3ed1c56 100644 (file)
--- a/libfreerdp/gdi/graphics.c
+++ b/libfreerdp/gdi/graphics.c
@@ -23,6 +23,7 @@
 
 #include <winpr/crt.h>
 
+#include <freerdp/log.h>
 #include <freerdp/gdi/dc.h>
 #include <freerdp/gdi/brush.h>
 #include <freerdp/gdi/shape.h>
@@ -40,6 +41,7 @@
 
 #include "graphics.h"
 
+#define TAG FREERDP_TAG("gdi")
 /* Bitmap Class */
 
 HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, int width, int height, int bpp, BYTE* data)