diff --git a/openigtlink-fix_byte_order.patch b/openigtlink-fix_byte_order.patch deleted file mode 100644 index cf25611..0000000 --- a/openigtlink-fix_byte_order.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Source/igtlutil/igtl_polydata.c b/Source/igtlutil/igtl_polydata.c -index 62557e7..ca6b585 100644 ---- a/Source/igtlutil/igtl_polydata.c -+++ b/Source/igtlutil/igtl_polydata.c -@@ -442,12 +442,19 @@ int igtl_export igtl_polydata_unpack(int type, void * byte_array, igtl_polydata_ - ptr32_dst = (igtl_uint32*)info->attributes[i].data; - ptr32_src = (igtl_uint32*)ptr; - ptr32_src_end = ptr32_src + n; -- while (ptr32_src < ptr32_src_end) -+ if (igtl_is_little_endian()) -+ { -+ while (ptr32_src < ptr32_src_end) - { -- *ptr32_dst = BYTE_SWAP_INT32(*ptr32_src); -- ptr32_dst ++; -- ptr32_src ++; -+ *ptr32_dst = BYTE_SWAP_INT32(*ptr32_src); -+ ptr32_dst ++; -+ ptr32_src ++; - } -+ } -+ else -+ { -+ memcpy(ptr32_dst, ptr32_src, s); -+ } - ptr += s; - } - diff --git a/openigtlink-remove_broken_code.patch b/openigtlink-remove_broken_code.patch deleted file mode 100644 index 706bcb0..0000000 --- a/openigtlink-remove_broken_code.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: OpenIGTLink-2.0/Source/igtlNDArrayMessage.h -=================================================================== ---- OpenIGTLink-2.0.orig/Source/igtlNDArrayMessage.h -+++ OpenIGTLink-2.0/Source/igtlNDArrayMessage.h -@@ -86,29 +86,6 @@ private: - template - class IGTLCommon_EXPORT Array : public ArrayBase - { --public: -- /// Sets a value of the element specified by 'index' -- int SetValue(IndexType index, T value) -- { -- if (Get1DIndex(index) <= GetNumberOfElements()) { -- * (T *) this->m_ByteArray[Get1DIndex(index) * sizeof(T)] = value; -- return 1; -- } else { -- return 0; -- } -- } -- -- /// Gets a value of the element specified by 'index' -- int GetValue(IndexType index, T & value) -- { -- if (Get1DIndex(index) <= GetNumberOfElements()) { -- value = * (T *) this->m_ByteArray[Get1DIndex(index) * sizeof(T)]; -- return 1; -- } else { -- return 0; -- } -- } -- - protected: - - /// Gets the size of elements (e.g. 1 byte in case of 8-bit integer) diff --git a/openigtlink.spec b/openigtlink.spec index 683a73b..43f2590 100644 --- a/openigtlink.spec +++ b/openigtlink.spec @@ -2,20 +2,14 @@ %global _docdir_fmt %{name} Name: openigtlink -Version: 2.0 -Release: 6%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Implementation of the OpenIGTLink network communication protocol License: BSD URL: http://openigtlink.org Source0: https://github.com/openigtlink/OpenIGTLink/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz -# upstream bug #120 -Patch0: openigtlink-remove_broken_code.patch - -# patch from upsream -Patch1: openigtlink-fix_byte_order.patch - # RHBZ1509365 Patch2: openigtlink-install_cmake.patch @@ -104,6 +98,9 @@ popd %changelog +* Sun Nov 19 2017 Dmitry Mikhirev - 2.1-1 +- Upstream release 2.1 + * Sun Nov 19 2017 Dmitry Mikhirev - 2.0-6 - Install igtl_status.h file #1509407 - Fix paths in cmake configuration file #1509365