From e08f805525c474ecfb2adcbe48e6afdc097d17a4 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 6 Aug 2020 15:17:15 +0300 Subject: [PATCH] small fixes --- CMakeLists.txt | 6 +++--- lib/cloud/piccloudclient.cpp | 4 ++-- lib/main/core/pibytearray.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87748bab..2c16f052 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(pip) -set(_PIP_MAJOR 1) -set(_PIP_MINOR 99) -set(_PIP_REVISION 3) +set(_PIP_MAJOR 2) +set(_PIP_MINOR 0) +set(_PIP_REVISION 0) set(_PIP_SUFFIX _prebeta) set(_PIP_COMPANY SHS) set(_PIP_DOMAIN org.SHS) diff --git a/lib/cloud/piccloudclient.cpp b/lib/cloud/piccloudclient.cpp index 98fec593..b17a2362 100644 --- a/lib/cloud/piccloudclient.cpp +++ b/lib/cloud/piccloudclient.cpp @@ -30,11 +30,11 @@ PICloudClient::~PICloudClient() { bool PICloudClient::openDevice() { - + return false; } bool PICloudClient::closeDevice() { - + return false; } diff --git a/lib/main/core/pibytearray.cpp b/lib/main/core/pibytearray.cpp index 470bdc26..f939ef0a 100644 --- a/lib/main/core/pibytearray.cpp +++ b/lib/main/core/pibytearray.cpp @@ -396,8 +396,8 @@ PIByteArray & operator >>(PIByteArray & s, PIByteArray & v) { } v.resize(sz); if (sz > 0) { - memcpy(v.data(), s.data(), v.size()); - s.remove(0, v.size()); + memcpy(v.data(), s.data(), sz); + s.remove(0, sz); } return s; }