This is an automated email from the git hooks/post-receive script. spectra pushed a commit to branch master in repository conquest-dicom-server.
commit ef1e31d1ab80df1062a2be365e30afbbec4302ba Author: Pablo Lorenzzoni <[email protected]> Date: Thu Feb 6 15:59:50 2014 -0200 Revert VRGroupPQueue destructor patch. --- debian/patches/0014-Fix-cppcheck-bug-2.patch | 39 ---------------------------- debian/patches/series | 1 - debian/rules | 3 ++- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/debian/patches/0014-Fix-cppcheck-bug-2.patch b/debian/patches/0014-Fix-cppcheck-bug-2.patch deleted file mode 100644 index 049d455..0000000 --- a/debian/patches/0014-Fix-cppcheck-bug-2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Pablo Lorenzzoni <[email protected]> -Date: Wed, 5 Feb 2014 17:40:22 -0200 -Subject: Fix cppcheck bug #2 - -[deivr.hpp:112]: (error) Memory leak: VRGroupPQueue::Element0 ---- - deivr.cxx | 6 ++++++ - deivr.hpp | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/deivr.cxx b/deivr.cxx -index 9c4e536..d7f4884 100644 ---- a/deivr.cxx -+++ b/deivr.cxx -@@ -387,6 +387,12 @@ UINT VRGroupPQueue :: operator == (VRGroupPQueue &vrgroup) - return ( 0 ); - } - -+ -+VRGroupPQueue :: ~VRGroupPQueue() -+{ -+ delete Element0; -+} -+ - /***************************************************** - * - * DICOM Objects -diff --git a/deivr.hpp b/deivr.hpp -index 851befe..252f1d0 100644 ---- a/deivr.hpp -+++ b/deivr.hpp -@@ -114,6 +114,7 @@ class VRGroupPQueue : - BOOL Push(VR *vr); - VR *Pop(); - VR *GroupLength(); -+ ~VRGroupPQueue(); // Need a destructor (it has a pointer) - UINT operator > (VRGroupPQueue &vrgroup); - UINT operator < (VRGroupPQueue &vrgroup); - UINT operator == (VRGroupPQueue &vrgroup); diff --git a/debian/patches/series b/debian/patches/series index 79efcb5..628672d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,3 @@ 0011-Fix-cppcheck-bug-4.patch 0012-Fix-cppcheck-bug-5.5.patch 0013-Fix-cppcheck-bugs-8-e-9.patch -0014-Fix-cppcheck-bug-2.patch diff --git a/debian/rules b/debian/rules index 8bb885c..4433fe6 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ # Debian Policy 10.1 CPP = /usr/bin/g++ CPPFLAGS = -O2 -g -Wall +CXXFLAGS = -O2 -g -Wall INSTALL = install -s %: @@ -23,7 +24,7 @@ jpeg-6c/libjpeg.a: $(MAKE) -C jpeg-6c dgate: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a - g++ $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS) + $(CPP) $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS) dgate.1: dgate ./debian/make-manpage -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
