mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0

Browse Source
This commit is contained in:
Marc-André Moreau 2011-09-02 12:40:05 -04:00
commit bc2e0c6d11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindOptionalPackage.cmake
View File

@ -31,11 +31,11 @@ macro(find_suggested_package _normal_package)
string(TOUPPER ${_normal_package} _upper_package)
option(WITH_${_upper_package} "Add dependency to ${_normal_package} - recommended" ON)
if(NOT WITHOUT_${_upper_package})
if(WITH_${_upper_package})
message(STATUS "Finding suggested package ${_normal_package}.")
message(STATUS " Disable this using \"-DWITH_${_upper_package}=OFF\".")
find_package(${_normal_package} REQUIRED)
endif(NOT WITHOUT_${_upper_package})
endif(WITH_${_upper_package})
endmacro(find_suggested_package)
macro(find_optional_package _normal_package)

4
libfreerdp-core/orders.c
View File

@ -753,9 +753,9 @@ void update_read_polyline_order(STREAM* s, ORDER_INFO* orderInfo, POLYLINE_ORDER
stream_read_uint8(s, polyline->cbData);
if (polyline->points == NULL)
polyline->points = (DELTA_POINT*) xmalloc(polyline->cbData);
polyline->points = (DELTA_POINT*) xmalloc(sizeof(DELTA_POINT) * polyline->numPoints);
else
polyline->points = (DELTA_POINT*) xrealloc(polyline->points, polyline->cbData);
polyline->points = (DELTA_POINT*) xrealloc(polyline->points, sizeof(DELTA_POINT) * polyline->numPoints);
update_read_delta_points(s, polyline->points, polyline->numPoints, polyline->xStart, polyline->yStart);
}