From 590a3be4d4e98bd43b03203cbadc403fd64f0f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 16 Aug 2016 15:37:15 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@224 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/code/picodeinfo.cpp | 2 +- src/code/picodeinfo.h | 2 +- src/code/picodemodule.h | 2 +- src/code/picodeparser.cpp | 2 +- src/code/picodeparser.h | 2 +- src/console/piconsole.cpp | 2 +- src/console/piconsole.h | 2 +- src/console/piconsolemodule.h | 2 +- src/console/pikbdlistener.cpp | 2 +- src/console/pikbdlistener.h | 2 +- src/console/piscreen.cpp | 2 +- src/console/piscreen.h | 2 +- src/console/piscreendrawer.cpp | 2 +- src/console/piscreendrawer.h | 2 +- src/console/piscreentile.cpp | 2 +- src/console/piscreentile.h | 2 +- src/console/piscreentiles.cpp | 2 +- src/console/piscreentiles.h | 2 +- src/console/piscreentypes.h | 2 +- src/containers/picontainers.cpp | 2 +- src/containers/picontainers.h | 2 +- src/containers/picontainersmodule.h | 2 +- src/containers/pideque.h | 2 +- src/containers/pimap.h | 2 +- src/containers/piqueue.h | 2 +- src/containers/piset.h | 2 +- src/containers/pistack.h | 2 +- src/containers/pivector.h | 2 +- src/core/pibase.h | 2 +- src/core/pibitarray.h | 2 +- src/core/pibytearray.cpp | 212 ++++++++++++++-------------- src/core/pibytearray.h | 28 +--- src/core/pichar.cpp | 2 +- src/core/pichar.h | 2 +- src/core/pichunkstream.h | 2 +- src/core/picli.cpp | 2 +- src/core/picli.h | 2 +- src/core/picollection.h | 2 +- src/core/picoremodule.h | 2 +- src/core/picout.cpp | 2 +- src/core/picout.h | 2 +- src/core/piflags.h | 2 +- src/core/piincludes.cpp | 2 +- src/core/piincludes.h | 2 +- src/core/piinit.cpp | 2 +- src/core/piinit.h | 2 +- src/core/piobject.cpp | 2 +- src/core/piobject.h | 2 +- src/core/pistatemachine.h | 2 +- src/core/pistring.cpp | 2 +- src/core/pistring.h | 2 +- src/core/pitime.cpp | 2 +- src/core/pitime.h | 2 +- src/core/pivariant.cpp | 2 +- src/core/pivariant.h | 2 +- src/geo/piellipsoidmodel.h | 2 +- src/geo/pigeomodule.h | 25 ++++ src/geo/pigeoposition.h | 2 +- src/io/pibinarylog.cpp | 2 +- src/io/pibinarylog.h | 2 +- src/io/piconfig.cpp | 2 +- src/io/piconfig.h | 2 +- src/io/piconnection.cpp | 2 +- src/io/piconnection.h | 2 +- src/io/pidiagnostics.cpp | 2 +- src/io/pidiagnostics.h | 2 +- src/io/pidir.cpp | 2 +- src/io/pidir.h | 2 +- src/io/piethernet.cpp | 2 +- src/io/piethernet.h | 2 +- src/io/pifile.cpp | 2 +- src/io/pifile.h | 2 +- src/io/piiodevice.cpp | 2 +- src/io/piiodevice.h | 2 +- src/io/piiomodule.h | 2 +- src/io/piiostring.cpp | 2 +- src/io/piiostring.h | 2 +- src/io/pimultiprotocol.cpp | 2 +- src/io/pimultiprotocol.h | 2 +- src/io/pipacketextractor.cpp | 2 +- src/io/pipacketextractor.h | 2 +- src/io/pipeer.cpp | 2 +- src/io/pipeer.h | 2 +- src/io/piprotocol.cpp | 2 +- src/io/piprotocol.h | 2 +- src/io/piserial.cpp | 2 +- src/io/piserial.h | 2 +- src/io/piusb.h | 2 +- src/math/picrc.h | 2 +- src/math/picrypt.cpp | 2 +- src/math/picrypt.h | 2 +- src/math/pievaluator.cpp | 2 +- src/math/pievaluator.h | 2 +- src/math/pifft.cpp | 2 +- src/math/pifft.h | 2 +- src/math/pifixedpoint.h | 2 +- src/math/pimath.h | 2 +- src/math/pimathbase.cpp | 2 +- src/math/pimathbase.h | 2 +- src/math/pimathmodule.h | 4 +- src/math/pimathsolver.cpp | 2 +- src/math/pimathsolver.h | 2 +- src/math/pistatistic.h | 2 +- src/pip.h | 17 +-- src/piplatform.h | 2 +- src/piversion.h | 2 +- src/system/picodec.cpp | 2 +- src/system/picodec.h | 2 +- src/system/pilibrary.cpp | 2 +- src/system/pilibrary.h | 2 +- src/system/pimonitor.cpp | 2 +- src/system/pimonitor.h | 2 +- src/system/piprocess.cpp | 2 +- src/system/piprocess.h | 2 +- src/system/pisignals.cpp | 2 +- src/system/pisignals.h | 2 +- src/system/pisysteminfo.cpp | 2 +- src/system/pisysteminfo.h | 2 +- src/system/pisystemmodule.h | 2 +- src/system/pisystemmonitor.cpp | 2 +- src/system/pisystemmonitor.h | 2 +- src/system/pisystemtests.cpp | 2 +- src/system/pisystemtests.h | 2 +- src/thread/pimutex.cpp | 2 +- src/thread/pimutex.h | 2 +- src/thread/pipipelinethread.h | 2 +- src/thread/pithread.cpp | 2 +- src/thread/pithread.h | 2 +- src/thread/pithreadmodule.h | 2 +- src/thread/pitimer.cpp | 2 +- src/thread/pitimer.h | 2 +- utils/code_model_generator/main.cpp | 2 +- utils/remote_console/main.cpp | 2 +- utils/system_daemon/main.cpp | 2 +- utils/system_test/main.cpp | 2 +- 135 files changed, 281 insertions(+), 265 deletions(-) create mode 100644 src/geo/pigeomodule.h diff --git a/src/code/picodeinfo.cpp b/src/code/picodeinfo.cpp index 2c399872..ada89b11 100755 --- a/src/code/picodeinfo.cpp +++ b/src/code/picodeinfo.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives C++ code info structs - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/code/picodeinfo.h b/src/code/picodeinfo.h index d56c80ea..0ee3feac 100755 --- a/src/code/picodeinfo.h +++ b/src/code/picodeinfo.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives C++ code info structs - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/code/picodemodule.h b/src/code/picodemodule.h index 26d6ef0a..f4f16171 100644 --- a/src/code/picodemodule.h +++ b/src/code/picodemodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/code/picodeparser.cpp b/src/code/picodeparser.cpp index a1b77844..ea495394 100755 --- a/src/code/picodeparser.cpp +++ b/src/code/picodeparser.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives C++ code parser - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/code/picodeparser.h b/src/code/picodeparser.h index 260feea8..39d0157b 100755 --- a/src/code/picodeparser.h +++ b/src/code/picodeparser.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives C++ code parser - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piconsole.cpp b/src/console/piconsole.cpp index cbf11bd3..dc696e4a 100644 --- a/src/console/piconsole.cpp +++ b/src/console/piconsole.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Console output/input - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piconsole.h b/src/console/piconsole.h index ee10bfe6..19840e2d 100644 --- a/src/console/piconsole.h +++ b/src/console/piconsole.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Console output/input - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piconsolemodule.h b/src/console/piconsolemodule.h index 4b4c397c..9d49c61a 100644 --- a/src/console/piconsolemodule.h +++ b/src/console/piconsolemodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/pikbdlistener.cpp b/src/console/pikbdlistener.cpp index 3aa5fae2..3187b966 100644 --- a/src/console/pikbdlistener.cpp +++ b/src/console/pikbdlistener.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Keyboard grabber for console - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/pikbdlistener.h b/src/console/pikbdlistener.h index 0e53fdb7..51f376ba 100644 --- a/src/console/pikbdlistener.h +++ b/src/console/pikbdlistener.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Keyboard grabber for console - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreen.cpp b/src/console/piscreen.cpp index d9cc2bbc..13da224b 100644 --- a/src/console/piscreen.cpp +++ b/src/console/piscreen.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Console output/input - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreen.h b/src/console/piscreen.h index e92635e5..02ac6481 100644 --- a/src/console/piscreen.h +++ b/src/console/piscreen.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Console output/input - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreendrawer.cpp b/src/console/piscreendrawer.cpp index 6226d24b..607c9d2a 100644 --- a/src/console/piscreendrawer.cpp +++ b/src/console/piscreendrawer.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Console output/input - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreendrawer.h b/src/console/piscreendrawer.h index 5cd5cdf3..a49a5849 100644 --- a/src/console/piscreendrawer.h +++ b/src/console/piscreendrawer.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Drawer for PIScreen - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreentile.cpp b/src/console/piscreentile.cpp index aaa881dc..0070b233 100644 --- a/src/console/piscreentile.cpp +++ b/src/console/piscreentile.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Basic PIScreen tile - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreentile.h b/src/console/piscreentile.h index 4bd1becb..b84ea065 100644 --- a/src/console/piscreentile.h +++ b/src/console/piscreentile.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Basic PIScreen tile - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreentiles.cpp b/src/console/piscreentiles.cpp index fa746470..725b23b7 100644 --- a/src/console/piscreentiles.cpp +++ b/src/console/piscreentiles.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Various tiles for PIScreen - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreentiles.h b/src/console/piscreentiles.h index d05cefaf..f0faeaf2 100644 --- a/src/console/piscreentiles.h +++ b/src/console/piscreentiles.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Various tiles for PIScreen - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/console/piscreentypes.h b/src/console/piscreentypes.h index 436a8333..77f6f18b 100644 --- a/src/console/piscreentypes.h +++ b/src/console/piscreentypes.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Types for PIScreen - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/picontainers.cpp b/src/containers/picontainers.cpp index a66ef029..9ba1029f 100755 --- a/src/containers/picontainers.cpp +++ b/src/containers/picontainers.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Generic containers - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/picontainers.h b/src/containers/picontainers.h index 8d42d6e5..6fe0d8a1 100755 --- a/src/containers/picontainers.h +++ b/src/containers/picontainers.h @@ -7,7 +7,7 @@ /* PIP - Platform Independent Primitives Generic containers - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/picontainersmodule.h b/src/containers/picontainersmodule.h index 7d9c66c8..aa6ef7c6 100644 --- a/src/containers/picontainersmodule.h +++ b/src/containers/picontainersmodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/pideque.h b/src/containers/pideque.h index 688f6036..bc629b17 100755 --- a/src/containers/pideque.h +++ b/src/containers/pideque.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Dynamic array of any type - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/pimap.h b/src/containers/pimap.h index 6b8421e3..1b59f049 100644 --- a/src/containers/pimap.h +++ b/src/containers/pimap.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Dynamic array of any type - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/piqueue.h b/src/containers/piqueue.h index bca83ad6..9768a9ca 100755 --- a/src/containers/piqueue.h +++ b/src/containers/piqueue.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Queue container - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/piset.h b/src/containers/piset.h index 946e8f2d..e677b279 100644 --- a/src/containers/piset.h +++ b/src/containers/piset.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Set container - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/pistack.h b/src/containers/pistack.h index 610a51fd..e10398df 100755 --- a/src/containers/pistack.h +++ b/src/containers/pistack.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Stack container - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/containers/pivector.h b/src/containers/pivector.h index d0cdf7e0..c12916d6 100755 --- a/src/containers/pivector.h +++ b/src/containers/pivector.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Dynamic array of any type - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pibase.h b/src/core/pibase.h index 0d3f6bcb..9cc524be 100644 --- a/src/core/pibase.h +++ b/src/core/pibase.h @@ -7,7 +7,7 @@ /* PIP - Platform Independent Primitives Base types and functions - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pibitarray.h b/src/core/pibitarray.h index 9574b439..2779b13d 100755 --- a/src/core/pibitarray.h +++ b/src/core/pibitarray.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Bit array - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pibytearray.cpp b/src/core/pibytearray.cpp index e8754b70..e69106f0 100755 --- a/src/core/pibytearray.cpp +++ b/src/core/pibytearray.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Byte array - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,112 +57,76 @@ */ -#pragma pack(push, 1) - -const char PIByteArray::base64Table[64] = { -0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, -0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, -0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, -0x59, 0x5a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, -0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, -0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, -0x77, 0x78, 0x79, 0x7a, 0x30, 0x31, 0x32, 0x33, -0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2f}; - -const char PIByteArray::base64InvTable[256] = { -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x3E, 0x0, 0x0, 0x0, 0x3F, -0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, -0x3C, 0x3D, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, -0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, -0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, -0x17, 0x18, 0x19, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, -0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, -0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, -0x31, 0x32, 0x33, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; - -#pragma pack(pop) - - -PIByteArray & PIByteArray::convertToBase64() { - base64HelpStruct hs; - PIByteArray t; - if (size() == 0) return *this; - int sz = (size_s() / 3) * 3; - for (int i = 0; i < sz; ++i) { - hs.byte.byte0 = hs.byte.byte1 = hs.byte.byte2 = 0; - hs.byte.byte0 = at(i); - hs.byte.byte1 = at(++i); - hs.byte.byte2 = at(++i); - t.push_back(base64Table[hs.ascii.ascii0]); - t.push_back(base64Table[hs.ascii.ascii1]); - t.push_back(base64Table[hs.ascii.ascii2]); - t.push_back(base64Table[hs.ascii.ascii3]); - } - hs.byte.byte0 = hs.byte.byte1 = hs.byte.byte2 = 0; sz = size() % 3; - switch (sz) { - case 1: - hs.byte.byte0 = back(); - t.push_back(base64Table[hs.ascii.ascii0]); - t.push_back(base64Table[hs.ascii.ascii1]); - t.push_back('='); - t.push_back('='); - break; - case 2: - hs.byte.byte0 = at(size() - 2); hs.byte.byte1 = back(); - t.push_back(base64Table[hs.ascii.ascii0]); - t.push_back(base64Table[hs.ascii.ascii1]); - t.push_back(base64Table[hs.ascii.ascii2]); - t.push_back('='); - break; - default: break; - } - *this = t; - return *this; +PIByteArray &PIByteArray::convertToBase64() { + return *this = toBase64(); } -PIByteArray & PIByteArray::convertFromBase64() { - base64HelpStruct hs; - PIByteArray t; - uint sz = size(); - if (sz == 0) return *this; - for (uint i = 0; i < sz; ++i) { - hs.byte.byte0 = hs.byte.byte1 = hs.byte.byte2 = 0; - hs.ascii.ascii0 = base64InvTable[at(i)]; - hs.ascii.ascii1 = base64InvTable[at(++i)]; - hs.ascii.ascii2 = base64InvTable[at(++i)]; - hs.ascii.ascii3 = base64InvTable[at(++i)]; - t.push_back(hs.byte.byte0); - t.push_back(hs.byte.byte1); - t.push_back(hs.byte.byte2); +PIByteArray &PIByteArray::convertFromBase64() { + return *this = fromBase64(*this); +} + + +PIByteArray PIByteArray::toBase64() const { + const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef" + "ghijklmn" "opqrstuv" "wxyz0123" "456789+/"; + const char padchar = '='; + int padlen = 0; + PIByteArray tmp((size() * 4) / 3 + 3); + int i = 0; + uchar *out = tmp.data(); + while (i < size_s()) { + int chunk = 0; + chunk |= int((*this)[i++]) << 16; + if (i == size()) { + padlen = 2; + } else { + chunk |= int((*this)[i++]) << 8; + if (i == size()) padlen = 1; + else chunk |= int((*this)[i++]); + } + int j = (chunk & 0x00fc0000) >> 18; + int k = (chunk & 0x0003f000) >> 12; + int l = (chunk & 0x00000fc0) >> 6; + int m = (chunk & 0x0000003f); + *out++ = alphabet[j]; + *out++ = alphabet[k]; + if (padlen > 1) *out++ = padchar; + else *out++ = alphabet[l]; + if (padlen > 0) *out++ = padchar; + else *out++ = alphabet[m]; } - if (back() == '=') t.pop_back(); - if (sz > 1) if (at(sz - 2) == '=') t.pop_back(); - *this = t; - return *this; + tmp.resize(out - tmp.data()); + return tmp; +} + + +PIByteArray PIByteArray::fromBase64(const PIByteArray &base64) { + unsigned int buf = 0; + int nbits = 0; + PIByteArray tmp((base64.size() * 3) / 4); + int offset = 0; + for (int i = 0; i < base64.size(); ++i) { + int ch = base64.at(i); + int d; + if (ch >= 'A' && ch <= 'Z') d = ch - 'A'; + else if (ch >= 'a' && ch <= 'z') d = ch - 'a' + 26; + else if (ch >= '0' && ch <= '9') d = ch - '0' + 52; + else if (ch == '+') d = 62; + else if (ch == '/') d = 63; + else d = -1; + if (d != -1) { + buf = (buf << 6) | d; + nbits += 6; + if (nbits >= 8) { + nbits -= 8; + tmp[offset++] = buf >> nbits; + buf &= (1 << nbits) - 1; + } + } + } + tmp.resize(offset); + return tmp; } @@ -246,6 +210,22 @@ PIString PIByteArray::toString(int base) const { } +PIString PIByteArray::toHex() const { + PIByteArray hex(size() * 2); + uchar *hexData = hex.data(); + const uchar *d = data(); + for (int i = 0; i < size_s(); ++i) { + int j = (d[i] >> 4) & 0xf; + if (j <= 9) hexData[i*2] = (j + '0'); + else hexData[i*2] = (j + 'a' - 10); + j = d[i] & 0xf; + if (j <= 9) hexData[i*2+1] = (j + '0'); + else hexData[i*2+1] = (j + 'a' - 10); + } + return PIString(hex); +} + + PIByteArray PIByteArray::fromString(PIString str) { PIByteArray ret; if (str.trim().isEmpty()) return ret; @@ -258,3 +238,29 @@ PIByteArray PIByteArray::fromString(PIString str) { } return ret; } + + +PIByteArray PIByteArray::fromHex(PIString str) { + PIByteArray hexEncoded = str.toByteArray(); + PIByteArray res((hexEncoded.size() + 1)/ 2); + uchar *result = res.data() + res.size(); + bool odd_digit = true; + for (int i = hexEncoded.size() - 1; i >= 0; --i) { + int ch = hexEncoded.at(i); + int tmp; + if (ch >= '0' && ch <= '9') tmp = ch - '0'; + else if (ch >= 'a' && ch <= 'f') tmp = ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') tmp = ch - 'A' + 10; + else continue; + if (odd_digit) { + --result; + *result = tmp; + odd_digit = false; + } else { + *result |= tmp << 4; + odd_digit = true; + } + } + res.remove(0, result - res.data()); + return res; +} diff --git a/src/core/pibytearray.h b/src/core/pibytearray.h index d76221db..f4011c6c 100755 --- a/src/core/pibytearray.h +++ b/src/core/pibytearray.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Byte array - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -73,10 +73,9 @@ public: PIByteArray & convertFromBase64(); //! Return converted to Base 64 data - PIByteArray toBase64() const {PIByteArray ba(*this); ba.convertToBase64(); return ba;} + PIByteArray toBase64() const; //! Return converted from Base 64 data - PIByteArray fromBase64() const {PIByteArray ba(*this); ba.convertFromBase64(); return ba;} PIByteArray & compressRLE(uchar threshold = 192); PIByteArray & decompressRLE(uchar threshold = 192); @@ -84,6 +83,7 @@ public: PIByteArray decompressedRLE(uchar threshold = 192) {PIByteArray ba(*this); ba.decompressRLE(threshold); return ba;} PIString toString(int base = 16) const; + PIString toHex() const; //! Add to the end data "data" with size "size" PIByteArray & append(const void * data_, int size_) {uint ps = size(); enlarge(size_); memcpy(data(ps), data_, size_); return *this;} @@ -107,26 +107,8 @@ public: void operator =(const PIDeque & d) {resize(d.size()); memcpy(data(), d.data(), d.size());} static PIByteArray fromString(PIString str); - -private: - union base64HelpStruct { - base64HelpStruct() {memset(this, 0, sizeof(base64HelpStruct));} - struct { - uchar ascii0: 6; - uchar ascii1: 6; - uchar ascii2: 6; - uchar ascii3: 6; - } ascii; - struct { - uchar byte0; - uchar byte1; - uchar byte2; - } byte; - }; - - static const char base64Table[64]; - static const char base64InvTable[256]; - + static PIByteArray fromHex(PIString str); + static PIByteArray fromBase64(const PIByteArray &base64); }; inline bool operator <(const PIByteArray & v0, const PIByteArray & v1) {if (v0.size() == v1.size()) {for (uint i = 0; i < v0.size(); ++i) if (v0[i] != v1[i]) return v0[i] < v1[i]; return false;} return v0.size() < v1.size();} diff --git a/src/core/pichar.cpp b/src/core/pichar.cpp index da80ad72..2fe563df 100644 --- a/src/core/pichar.cpp +++ b/src/core/pichar.cpp @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Unicode char - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pichar.h b/src/core/pichar.h index 97b2c32f..1edf23ff 100755 --- a/src/core/pichar.h +++ b/src/core/pichar.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Unicode char - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pichunkstream.h b/src/core/pichunkstream.h index a6de989c..de7b1d6f 100644 --- a/src/core/pichunkstream.h +++ b/src/core/pichunkstream.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Binary serializator - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picli.cpp b/src/core/picli.cpp index 1f780c04..23685bb1 100755 --- a/src/core/picli.cpp +++ b/src/core/picli.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Command-Line Parser - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picli.h b/src/core/picli.h index 1872c907..592dfa3a 100755 --- a/src/core/picli.h +++ b/src/core/picli.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Command-Line Parser - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picollection.h b/src/core/picollection.h index dcf51d4b..eb34e34f 100755 --- a/src/core/picollection.h +++ b/src/core/picollection.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Peer - named I/O ethernet node, forming self-organized peering network - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picoremodule.h b/src/core/picoremodule.h index 9a0e0de8..9205f8ae 100644 --- a/src/core/picoremodule.h +++ b/src/core/picoremodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picout.cpp b/src/core/picout.cpp index 4e36c94e..1b89feb1 100644 --- a/src/core/picout.cpp +++ b/src/core/picout.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Universal output to console class - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/picout.h b/src/core/picout.h index b2ec2e97..202f6cca 100644 --- a/src/core/picout.h +++ b/src/core/picout.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Universal output to console class - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piflags.h b/src/core/piflags.h index 8091ce4c..a8661e6c 100644 --- a/src/core/piflags.h +++ b/src/core/piflags.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives General flags class - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piincludes.cpp b/src/core/piincludes.cpp index 69c83795..6a5af22d 100755 --- a/src/core/piincludes.cpp +++ b/src/core/piincludes.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Global includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piincludes.h b/src/core/piincludes.h index 898083d2..1eb9f7dc 100755 --- a/src/core/piincludes.h +++ b/src/core/piincludes.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Minimal PIP includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piinit.cpp b/src/core/piinit.cpp index 557c069f..855903b9 100644 --- a/src/core/piinit.cpp +++ b/src/core/piinit.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Initialization - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piinit.h b/src/core/piinit.h index 6e63f05c..a8e9786f 100644 --- a/src/core/piinit.h +++ b/src/core/piinit.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Initialization - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piobject.cpp b/src/core/piobject.cpp index 23e601bc..ab93a16d 100755 --- a/src/core/piobject.cpp +++ b/src/core/piobject.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Object, base class of some PIP classes, provide EVENT -> EVENT_HANDLER mechanism - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/piobject.h b/src/core/piobject.h index 5ce5c09f..7b68a849 100755 --- a/src/core/piobject.h +++ b/src/core/piobject.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Object, base class of some PIP classes, provide EVENT -> EVENT_HANDLER mechanism - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pistatemachine.h b/src/core/pistatemachine.h index 6ab963f9..86839251 100755 --- a/src/core/pistatemachine.h +++ b/src/core/pistatemachine.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives State machine - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pistring.cpp b/src/core/pistring.cpp index 11167273..d673453b 100755 --- a/src/core/pistring.cpp +++ b/src/core/pistring.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives String - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pistring.h b/src/core/pistring.h index aabdcd9a..c16ad689 100755 --- a/src/core/pistring.h +++ b/src/core/pistring.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives String - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pitime.cpp b/src/core/pitime.cpp index ce3f86c2..7d96fef6 100755 --- a/src/core/pitime.cpp +++ b/src/core/pitime.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Timer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pitime.h b/src/core/pitime.h index 439e749d..444a6ca7 100755 --- a/src/core/pitime.h +++ b/src/core/pitime.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Time structs - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pivariant.cpp b/src/core/pivariant.cpp index 6a71f47f..d7ca1476 100755 --- a/src/core/pivariant.cpp +++ b/src/core/pivariant.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Variant type - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/pivariant.h b/src/core/pivariant.h index 719cbe5e..1b8fd3fb 100755 --- a/src/core/pivariant.h +++ b/src/core/pivariant.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Variant type - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/geo/piellipsoidmodel.h b/src/geo/piellipsoidmodel.h index 42d9674b..3dc1b4db 100644 --- a/src/geo/piellipsoidmodel.h +++ b/src/geo/piellipsoidmodel.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Contains geo ellipsoid models - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/geo/pigeomodule.h b/src/geo/pigeomodule.h new file mode 100644 index 00000000..5a8d1cb6 --- /dev/null +++ b/src/geo/pigeomodule.h @@ -0,0 +1,25 @@ +/* + PIP - Platform Independent Primitives + Module includes + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef PIGEOMODULE_H +#define PIGEOMODULE_H + +#include "pigeoposition.h" + +#endif // PIGEOMODULE_H diff --git a/src/geo/pigeoposition.h b/src/geo/pigeoposition.h index 4b618975..c7e8dcc8 100644 --- a/src/geo/pigeoposition.h +++ b/src/geo/pigeoposition.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for geo position storage and conversions - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pibinarylog.cpp b/src/io/pibinarylog.cpp index 88dd04a9..65954447 100644 --- a/src/io/pibinarylog.cpp +++ b/src/io/pibinarylog.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Class for write binary data to logfile, and read or playback this data - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pibinarylog.h b/src/io/pibinarylog.h index 554192dc..8f23f8dd 100644 --- a/src/io/pibinarylog.h +++ b/src/io/pibinarylog.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for write binary data to logfile, and read or playback this data - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piconfig.cpp b/src/io/piconfig.cpp index a6b95ed3..2b69ac9c 100755 --- a/src/io/piconfig.cpp +++ b/src/io/piconfig.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Config parser - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piconfig.h b/src/io/piconfig.h index 0b8ada9b..5507a404 100755 --- a/src/io/piconfig.h +++ b/src/io/piconfig.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Configuration parser and writer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piconnection.cpp b/src/io/piconnection.cpp index 4ce54abf..50a76a82 100755 --- a/src/io/piconnection.cpp +++ b/src/io/piconnection.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Complex I/O point - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piconnection.h b/src/io/piconnection.h index 76f20292..863ff648 100755 --- a/src/io/piconnection.h +++ b/src/io/piconnection.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Complex I/O point - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pidiagnostics.cpp b/src/io/pidiagnostics.cpp index 029077b2..8f57aa34 100755 --- a/src/io/pidiagnostics.cpp +++ b/src/io/pidiagnostics.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Speed and quality in/out diagnostics - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pidiagnostics.h b/src/io/pidiagnostics.h index 2acf8f49..4afaf19f 100755 --- a/src/io/pidiagnostics.h +++ b/src/io/pidiagnostics.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Speed and quality in/out diagnostics - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pidir.cpp b/src/io/pidir.cpp index c7f8af10..df82f79a 100755 --- a/src/io/pidir.cpp +++ b/src/io/pidir.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Directory - Copyright (C) 2014 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pidir.h b/src/io/pidir.h index fbe0a795..3e54f9fb 100755 --- a/src/io/pidir.h +++ b/src/io/pidir.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Directory - Copyright (C) 2014 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piethernet.cpp b/src/io/piethernet.cpp index 34f4262c..7f5ca336 100755 --- a/src/io/piethernet.cpp +++ b/src/io/piethernet.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Ethernet, UDP/TCP Broadcast/Multicast - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piethernet.h b/src/io/piethernet.h index e3e7bd3f..1a69c535 100755 --- a/src/io/piethernet.h +++ b/src/io/piethernet.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Ethernet, UDP/TCP Broadcast/Multicast - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pifile.cpp b/src/io/pifile.cpp index 9a33fdf1..50db3410 100755 --- a/src/io/pifile.cpp +++ b/src/io/pifile.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives File - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pifile.h b/src/io/pifile.h index 823e98b0..847f08e7 100755 --- a/src/io/pifile.h +++ b/src/io/pifile.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives File - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piiodevice.cpp b/src/io/piiodevice.cpp index a04b661b..33886112 100755 --- a/src/io/piiodevice.cpp +++ b/src/io/piiodevice.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Abstract input/output device - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piiodevice.h b/src/io/piiodevice.h index 5ed0b498..958a417f 100755 --- a/src/io/piiodevice.h +++ b/src/io/piiodevice.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Abstract input/output device - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piiomodule.h b/src/io/piiomodule.h index 9c02196c..7dc62a40 100644 --- a/src/io/piiomodule.h +++ b/src/io/piiomodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piiostring.cpp b/src/io/piiostring.cpp index bbea5972..089438bc 100644 --- a/src/io/piiostring.cpp +++ b/src/io/piiostring.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives PIIODevice wrapper around PIString - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piiostring.h b/src/io/piiostring.h index 74aaa958..6c4fce93 100644 --- a/src/io/piiostring.h +++ b/src/io/piiostring.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives PIIODevice wrapper around PIString - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pimultiprotocol.cpp b/src/io/pimultiprotocol.cpp index 5ba7e968..9fb9b7de 100755 --- a/src/io/pimultiprotocol.cpp +++ b/src/io/pimultiprotocol.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Multiprotocol - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pimultiprotocol.h b/src/io/pimultiprotocol.h index 5c33dcbb..9576ba6d 100755 --- a/src/io/pimultiprotocol.h +++ b/src/io/pimultiprotocol.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Multiprotocol - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pipacketextractor.cpp b/src/io/pipacketextractor.cpp index 9958c9b8..e681604f 100755 --- a/src/io/pipacketextractor.cpp +++ b/src/io/pipacketextractor.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Packets extractor - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pipacketextractor.h b/src/io/pipacketextractor.h index 41fc9f75..ea8fb0e1 100755 --- a/src/io/pipacketextractor.h +++ b/src/io/pipacketextractor.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Packets extractor - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp index d24bee9e..d4fc432d 100755 --- a/src/io/pipeer.cpp +++ b/src/io/pipeer.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Peer - named I/O ethernet node - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/pipeer.h b/src/io/pipeer.h index e2720aa4..fa821d95 100755 --- a/src/io/pipeer.h +++ b/src/io/pipeer.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Peer - named I/O ethernet node, forming self-organized peering network - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piprotocol.cpp b/src/io/piprotocol.cpp index 23b8ae31..df14acac 100755 --- a/src/io/piprotocol.cpp +++ b/src/io/piprotocol.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Protocol, input/output channel (COM, UDP) - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piprotocol.h b/src/io/piprotocol.h index 0fef7b21..4fa5b544 100755 --- a/src/io/piprotocol.h +++ b/src/io/piprotocol.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Protocol, input/output channel (COM, UDP) - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piserial.cpp b/src/io/piserial.cpp index 3f08576e..f904cd80 100755 --- a/src/io/piserial.cpp +++ b/src/io/piserial.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives COM - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piserial.h b/src/io/piserial.h index b23add9a..c2f59e36 100755 --- a/src/io/piserial.h +++ b/src/io/piserial.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives COM - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Bychkov Andrey wapmobil@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/io/piusb.h b/src/io/piusb.h index c015f961..96cce3f1 100755 --- a/src/io/piusb.h +++ b/src/io/piusb.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives USB, based on libusb - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/picrc.h b/src/math/picrc.h index c2437abd..92500508 100755 --- a/src/math/picrc.h +++ b/src/math/picrc.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives CRC checksum calculator - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/picrypt.cpp b/src/math/picrypt.cpp index fc8cf76b..10feee9c 100644 --- a/src/math/picrypt.cpp +++ b/src/math/picrypt.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Cryptographic class using lib Sodium - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/picrypt.h b/src/math/picrypt.h index 1bad9560..8c031871 100644 --- a/src/math/picrypt.h +++ b/src/math/picrypt.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Cryptographic class using lib Sodium - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pievaluator.cpp b/src/math/pievaluator.cpp index 46380e57..aefa3059 100755 --- a/src/math/pievaluator.cpp +++ b/src/math/pievaluator.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Evaluator designed for stream computing - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pievaluator.h b/src/math/pievaluator.h index b405c9d3..7e5fe670 100755 --- a/src/math/pievaluator.h +++ b/src/math/pievaluator.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Evaluator designed for stream calculations - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pifft.cpp b/src/math/pifft.cpp index ef5807bd..654e3f68 100644 --- a/src/math/pifft.cpp +++ b/src/math/pifft.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Class for FFT, IFFT and Hilbert transformations - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pifft.h b/src/math/pifft.h index 73c75a41..7e161790 100644 --- a/src/math/pifft.h +++ b/src/math/pifft.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for FFT, IFFT and Hilbert transformations - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pifixedpoint.h b/src/math/pifixedpoint.h index 8d047eaf..e811f296 100644 --- a/src/math/pifixedpoint.h +++ b/src/math/pifixedpoint.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for fixed point numbers - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pimath.h b/src/math/pimath.h index b9283cf3..b1364152 100644 --- a/src/math/pimath.h +++ b/src/math/pimath.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Many mathematical functions and classes - Copyright (C) 2014 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pimathbase.cpp b/src/math/pimathbase.cpp index 89214b3a..2fbdb9e5 100644 --- a/src/math/pimathbase.cpp +++ b/src/math/pimathbase.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Basic mathematical functions and defines - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pimathbase.h b/src/math/pimathbase.h index 36d5770a..350055c3 100644 --- a/src/math/pimathbase.h +++ b/src/math/pimathbase.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Basic mathematical functions and defines - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pimathmodule.h b/src/math/pimathmodule.h index 01aa120a..1598bd08 100644 --- a/src/math/pimathmodule.h +++ b/src/math/pimathmodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,5 +25,7 @@ #include "pievaluator.h" #include "pifft.h" #include "picrc.h" +#include "picrypt.h" +#include "pifixedpoint.h" #endif // PIMATHMODULE_H diff --git a/src/math/pimathsolver.cpp b/src/math/pimathsolver.cpp index 04a00f69..fac1dccc 100644 --- a/src/math/pimathsolver.cpp +++ b/src/math/pimathsolver.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives PIMathSolver - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pimathsolver.h b/src/math/pimathsolver.h index 84ad2c65..9eb8ffb3 100644 --- a/src/math/pimathsolver.h +++ b/src/math/pimathsolver.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives PIMathSolver - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/math/pistatistic.h b/src/math/pistatistic.h index 1056d82a..aebc294f 100644 --- a/src/math/pistatistic.h +++ b/src/math/pistatistic.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for calculacing math statistic in values array - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/pip.h b/src/pip.h index 10bb66c9..5e553e5e 100755 --- a/src/pip.h +++ b/src/pip.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives All includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com, Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,12 +20,13 @@ #ifndef PIP_H #define PIP_H -#include "picoremodule.h" -#include "picontainersmodule.h" -#include "piconsolemodule.h" -#include "pithreadmodule.h" -#include "piiomodule.h" -#include "pimathmodule.h" -#include "pisystemmodule.h" +#include "pip/picoremodule.h" +#include "pip/picontainersmodule.h" +#include "pip/piconsolemodule.h" +#include "pip/pithreadmodule.h" +#include "pip/piiomodule.h" +#include "pip/pimathmodule.h" +#include "pip/pigeomodule.h" +#include "pip/pisystemmodule.h" #endif // PIP_H diff --git a/src/piplatform.h b/src/piplatform.h index aa6ca1cb..763ab857 100644 --- a/src/piplatform.h +++ b/src/piplatform.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Platform and compiler macros - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/piversion.h b/src/piversion.h index 18a85a4d..36d7aac8 100644 --- a/src/piversion.h +++ b/src/piversion.h @@ -4,7 +4,7 @@ #define PIP_VERSION_MAJOR 0 #define PIP_VERSION_MINOR 5 -#define PIP_VERSION_REVISION 5 +#define PIP_VERSION_REVISION 6 #define PIP_VERSION_SUFFIX "" #endif // PIVERSION_H diff --git a/src/system/picodec.cpp b/src/system/picodec.cpp index 728e617d..adb2a346 100755 --- a/src/system/picodec.cpp +++ b/src/system/picodec.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Text codings coder, based on "iconv" - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/picodec.h b/src/system/picodec.h index 21e9c9ab..45dbfd90 100755 --- a/src/system/picodec.h +++ b/src/system/picodec.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Text codings coder, based on "iconv" - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pilibrary.cpp b/src/system/pilibrary.cpp index 0ce4680e..33733100 100644 --- a/src/system/pilibrary.cpp +++ b/src/system/pilibrary.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Dynamic library - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pilibrary.h b/src/system/pilibrary.h index 8df3b409..27ced99b 100644 --- a/src/system/pilibrary.h +++ b/src/system/pilibrary.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Dynamic library - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pimonitor.cpp b/src/system/pimonitor.cpp index 529b7853..8d6048d0 100755 --- a/src/system/pimonitor.cpp +++ b/src/system/pimonitor.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Counter of some PIP types - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pimonitor.h b/src/system/pimonitor.h index 7ed9e72f..ea703a27 100755 --- a/src/system/pimonitor.h +++ b/src/system/pimonitor.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Counter of some PIP types - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/piprocess.cpp b/src/system/piprocess.cpp index f9e5ed71..080a5543 100755 --- a/src/system/piprocess.cpp +++ b/src/system/piprocess.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Process - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/piprocess.h b/src/system/piprocess.h index d70b312f..17fc49e5 100755 --- a/src/system/piprocess.h +++ b/src/system/piprocess.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Process - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisignals.cpp b/src/system/pisignals.cpp index 3bbe233f..75c872cf 100755 --- a/src/system/pisignals.cpp +++ b/src/system/pisignals.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Signals - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisignals.h b/src/system/pisignals.h index 6b76d3fe..b7f30c25 100755 --- a/src/system/pisignals.h +++ b/src/system/pisignals.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Signals - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisysteminfo.cpp b/src/system/pisysteminfo.cpp index 0e6e4ca4..1538cc10 100644 --- a/src/system/pisysteminfo.cpp +++ b/src/system/pisysteminfo.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives System information - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisysteminfo.h b/src/system/pisysteminfo.h index 537941cc..c8593d67 100644 --- a/src/system/pisysteminfo.h +++ b/src/system/pisysteminfo.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives System information - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisystemmodule.h b/src/system/pisystemmodule.h index cdbad4d8..9c855521 100644 --- a/src/system/pisystemmodule.h +++ b/src/system/pisystemmodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisystemmonitor.cpp b/src/system/pisystemmonitor.cpp index 2c08e4e9..1ab492b7 100755 --- a/src/system/pisystemmonitor.cpp +++ b/src/system/pisystemmonitor.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Process resource monitor - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisystemmonitor.h b/src/system/pisystemmonitor.h index 865b30f1..5af4ceee 100755 --- a/src/system/pisystemmonitor.h +++ b/src/system/pisystemmonitor.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Process resource monitor - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisystemtests.cpp b/src/system/pisystemtests.cpp index 53f20af5..40857542 100755 --- a/src/system/pisystemtests.cpp +++ b/src/system/pisystemtests.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives System tests results (see system_test folder) - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/system/pisystemtests.h b/src/system/pisystemtests.h index eb6eb1ff..5088393b 100755 --- a/src/system/pisystemtests.h +++ b/src/system/pisystemtests.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives System tests results (see system_test folder) - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pimutex.cpp b/src/thread/pimutex.cpp index 77955824..e091abd2 100755 --- a/src/thread/pimutex.cpp +++ b/src/thread/pimutex.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Mutex - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pimutex.h b/src/thread/pimutex.h index 2d9c22cc..d3b03c4d 100755 --- a/src/thread/pimutex.h +++ b/src/thread/pimutex.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Mutex - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pipipelinethread.h b/src/thread/pipipelinethread.h index b65ae54c..e5abbed9 100644 --- a/src/thread/pipipelinethread.h +++ b/src/thread/pipipelinethread.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Class for create multihread pipeline - Copyright (C) 2015 Andrey Bychkov work.a.b@yandex.ru + Copyright (C) 2016 Andrey Bychkov work.a.b@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pithread.cpp b/src/thread/pithread.cpp index 8f794e54..3a32e5e0 100755 --- a/src/thread/pithread.cpp +++ b/src/thread/pithread.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Thread - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pithread.h b/src/thread/pithread.h index cfaf2ab5..3f05d858 100755 --- a/src/thread/pithread.h +++ b/src/thread/pithread.h @@ -6,7 +6,7 @@ /* PIP - Platform Independent Primitives Thread - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pithreadmodule.h b/src/thread/pithreadmodule.h index cd80c21f..d86919ee 100644 --- a/src/thread/pithreadmodule.h +++ b/src/thread/pithreadmodule.h @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Module includes - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pitimer.cpp b/src/thread/pitimer.cpp index e188fd4e..6225003a 100755 --- a/src/thread/pitimer.cpp +++ b/src/thread/pitimer.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Timer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/thread/pitimer.h b/src/thread/pitimer.h index 78bf68a1..9adcc7d6 100755 --- a/src/thread/pitimer.h +++ b/src/thread/pitimer.h @@ -4,7 +4,7 @@ /* PIP - Platform Independent Primitives Timer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp index d0ee251c..93b5aa2e 100755 --- a/utils/code_model_generator/main.cpp +++ b/utils/code_model_generator/main.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Code model generator - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils/remote_console/main.cpp b/utils/remote_console/main.cpp index 0ba858bc..54a8881f 100755 --- a/utils/remote_console/main.cpp +++ b/utils/remote_console/main.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Remote console viewer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp index 0417423a..6267c5d9 100755 --- a/utils/system_daemon/main.cpp +++ b/utils/system_daemon/main.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Remote console viewer - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utils/system_test/main.cpp b/utils/system_test/main.cpp index ee8263f4..a448ff80 100755 --- a/utils/system_test/main.cpp +++ b/utils/system_test/main.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives System tests program - Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by