From 3df754e0bbea00b08fc2f87d18ec400f6f5580c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Fri, 18 Jan 2013 19:43:53 -0500 Subject: [PATCH] libfreerdp-codec: fix build --- libfreerdp/codec/CMakeLists.txt | 2 +- libfreerdp/codec/rfx_decode.c | 10 ++++------ libfreerdp/primitives/test/.gitignore | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 libfreerdp/primitives/test/.gitignore diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt index 5c6a7fe81..612fda9ea 100644 --- a/libfreerdp/codec/CMakeLists.txt +++ b/libfreerdp/codec/CMakeLists.txt @@ -97,7 +97,7 @@ set(${MODULE_PREFIX}_LIBS set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL MODULE freerdp - MODULES freerdp-utils) + MODULES freerdp-primitives freerdp-utils) message(STATUS "libfreerdp-codec libs: ${${MODULE_PREFIX}_LIBS}") diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index 02d87d8d4..91e0e949b 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -138,13 +138,11 @@ void rfx_decode_rgb(RFX_CONTEXT* context, STREAM* data_in, rfx_decode_component(context, cr_quants, stream_get_tail(data_in), cr_size, context->priv->cr_b_buffer); /* CrData */ stream_seek(data_in, cr_size); - PROFILER_ENTER(context->priv->prof_rfx_decode_ycbcr_to_rgb); - pSrcDst[0] = context->priv->y_r_buffer; - pSrcDst[1] = context->priv->cb_g_buffer; - pSrcDst[2] = context->priv->cr_b_buffer; - prims->yCbCrToRGB_16s16s_P3P3((const INT16 **) pSrcDst, 64*sizeof(INT16), + pSrcDst[0] = context->priv->y_r_buffer; + pSrcDst[1] = context->priv->cb_g_buffer; + pSrcDst[2] = context->priv->cr_b_buffer; + prims->yCbCrToRGB_16s16s_P3P3((const INT16 **) pSrcDst, 64*sizeof(INT16), pSrcDst, 64*sizeof(INT16), &roi_64x64); - PROFILER_EXIT(context->priv->prof_rfx_decode_ycbcr_to_rgb); PROFILER_ENTER(context->priv->prof_rfx_decode_format_rgb); rfx_decode_format_rgb(context->priv->y_r_buffer, context->priv->cb_g_buffer, context->priv->cr_b_buffer, diff --git a/libfreerdp/primitives/test/.gitignore b/libfreerdp/primitives/test/.gitignore new file mode 100644 index 000000000..082fee1c1 --- /dev/null +++ b/libfreerdp/primitives/test/.gitignore @@ -0,0 +1,2 @@ +prim_test +