30.11.2013 - New PICollection namespace, Android support, my own PIVector implementation

pibytearray.h

@@ -54,13 +54,13 @@ class PIP_EXPORT PIByteArray: public PIVector<uchar>
 {
 public:
 	
-	//! Contructs an empty byte array
+	//! Constructs an empty byte array
 	PIByteArray() {;}
 	
-	//! Contructs 0-filled byte array size "size"
+	//! Constructs 0-filled byte array with size "size"
 	PIByteArray(const uint size) {resize(size);}
 	
-	//! Contructs byte array from data "data" and size "size"
+	//! Constructs byte array from data "data" and size "size"
 	PIByteArray(const void * data, const uint size) {for (uint i = 0; i < size; ++i) push_back(((uchar * )data)[i]);}
 	
 	
@@ -69,9 +69,9 @@ public:
 		friend PIByteArray & operator <<(PIByteArray & s, const PIByteArray::RawData & v);
 		friend PIByteArray & operator >>(PIByteArray & s, PIByteArray::RawData v);
 	public:
-		//! Contructs data block
+		//! Constructs data block
 		RawData(void * data, int size) {d = data; s = size;}
-		//! Contructs data block
+		//! Constructs data block
 		RawData(const void * data, const int size) {d = const_cast<void * >(data); s = size;}
 		RawData & operator =(const RawData & o) {d = o.d; s = o.s; return *this;}
 	private:
@@ -102,10 +102,10 @@ public:
 	PIByteArray & compressHuffman() {*this = huffman.compress(*this); return *this;}
 
 	//! Add to the end data "data" with size "size"
-	PIByteArray & append(void * data, int size) {for (int i = 0; i < size; ++i) push_back(((uchar*)data)[i]); return *this;}
+	PIByteArray & append(const void * data_, int size_) {uint ps = size(); enlarge(size_); memcpy(data(ps), data_, size_); return *this;}
 	
 	//! Add to the end byte array "data"
-	PIByteArray & append(const PIByteArray & data) {for (int i = 0; i < data.size_s(); ++i) push_back(data[i]); return *this;}
+	PIByteArray & append(const PIByteArray & data_) {uint ps = size(); enlarge(data_.size_s()); memcpy(data(ps), data_.data(), data_.size()); return *this;}
 	/*PIByteArray & operator <<(short v) {for (uint i = 0; i < sizeof(v); ++i) push_back(((uchar*)(&v))[i]); return *this;}
 	PIByteArray & operator <<(ushort v) {for (uint i = 0; i < sizeof(v); ++i) push_back(((uchar*)(&v))[i]); return *this;}
 	PIByteArray & operator <<(int v) {for (uint i = 0; i < sizeof(v); ++i) push_back(((uchar*)(&v))[i]); return *this;}
@@ -183,9 +183,9 @@ inline PIByteArray & operator <<(PIByteArray & s, const ullong & v) {PBA_OPERATO
 inline PIByteArray & operator <<(PIByteArray & s, const float v) {PBA_OPERATOR_TO return s;}
 //! \relatesalso PIByteArray \brief Store operator
 inline PIByteArray & operator <<(PIByteArray & s, const double & v) {PBA_OPERATOR_TO return s;}
-//! \relatesalso PIByteArray \brief Store operator
+//! \relatesalso PIByteArray \brief Store operator, see \ref PIByteArray_sec1 for details
 inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray & v) {s << v.size_s(); int os = s.size_s(); s.enlarge(v.size_s()); if (v.size_s() > 0) memcpy(s.data(os), v.data(), v.size()); return s;}
-//! \relatesalso PIByteArray \brief Store operator
+//! \relatesalso PIByteArray \brief Store operator, see \ref PIByteArray_sec1 for details
 inline PIByteArray & operator <<(PIByteArray & s, const PIByteArray::RawData & v) {int os = s.size_s(); s.enlarge(v.s); if (v.s > 0) memcpy(s.data(os), v.d, v.s); return s;}
 //! \relatesalso PIByteArray \brief Store operator
 template <typename T>
@@ -226,9 +226,9 @@ inline PIByteArray & operator >>(PIByteArray & s, ullong & v) {assert(s.size() >
 inline PIByteArray & operator >>(PIByteArray & s, float & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
 //! \relatesalso PIByteArray \brief Restore operator
 inline PIByteArray & operator >>(PIByteArray & s, double & v) {assert(s.size() >= sizeof(v)); PBA_OPERATOR_FROM return s;}
-//! \relatesalso PIByteArray \brief Restore operator
+//! \relatesalso PIByteArray \brief Restore operator, see \ref PIByteArray_sec1 for details
 inline PIByteArray & operator >>(PIByteArray & s, PIByteArray & v) {assert(s.size_s() >= 4); int sz; s >> sz; v.resize(sz); if (sz > 0) memcpy(v.data(), s.data(), v.size()); s.remove(0, v.size()); return s;}
-//! \relatesalso PIByteArray \brief Restore operator
+//! \relatesalso PIByteArray \brief Restore operator, see \ref PIByteArray_sec1 for details
 inline PIByteArray & operator >>(PIByteArray & s, PIByteArray::RawData v) {assert(s.size_s() >= v.s); if (v.s > 0) memcpy(v.d, s.data(), v.s); s.remove(0, v.s); return s;}
 //! \relatesalso PIByteArray \brief Restore operator
 template <typename T>