[SCM] libgig/master: Removed 03-deletechuncklist.patch - upstream request.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sat Nov 26 14:42:51 UTC 2016


The following commit has been merged in the master branch:
commit 32df5275a90a8557d7f0d2bb70d89bb07593f213
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 26 15:42:33 2016 +0100

    Removed 03-deletechuncklist.patch - upstream request.

diff --git a/debian/patches/03-deletechuncklist.patch b/debian/patches/03-deletechuncklist.patch
deleted file mode 100644
index a7df631..0000000
--- a/debian/patches/03-deletechuncklist.patch
+++ /dev/null
@@ -1,21 +0,0 @@
----
- src/RIFF.cpp |    8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
---- libgig.orig/src/RIFF.cpp
-+++ libgig/src/RIFF.cpp
-@@ -997,13 +997,7 @@ namespace RIFF {
- 
-     void List::DeleteChunkList() {
-         if (pSubChunks) {
--            ChunkList::iterator iter = pSubChunks->begin();
--            ChunkList::iterator end  = pSubChunks->end();
--            while (iter != end) {
--                delete *iter;
--                iter++;
--            }
--            delete pSubChunks;
-+            pSubChunks->clear();
-             pSubChunks = NULL;
-         }
-         if (pSubChunksMap) {
diff --git a/debian/patches/04-spelling.patch b/debian/patches/04-spelling.patch
index 69b9f01..d243d2b 100644
--- a/debian/patches/04-spelling.patch
+++ b/debian/patches/04-spelling.patch
@@ -228,7 +228,7 @@ Index: libgig/src/RIFF.cpp
       */
      uint32_t Chunk::ReadUint32() {
        #if DEBUG
-@@ -1502,7 +1502,7 @@ namespace RIFF {
+@@ -1508,7 +1508,7 @@ namespace RIFF {
       * Loads an existing RIFF file with all its chunks.
       *
       * @param path - path and file name of the RIFF file to open
@@ -237,7 +237,7 @@ Index: libgig/src/RIFF.cpp
       *                         given RIFF file
       */
      File::File(const String& path)
-@@ -1546,7 +1546,7 @@ namespace RIFF {
+@@ -1552,7 +1552,7 @@ namespace RIFF {
       *                   first chunk found in the file)
       * @param Endian - whether the file uses little endian or big endian layout
       * @param layout - general file structure type
@@ -246,7 +246,7 @@ Index: libgig/src/RIFF.cpp
       *                         given RIFF-alike file
       */
      File::File(const String& path, uint32_t FileType, endian_t Endian, layout_t layout)
-@@ -1569,7 +1569,7 @@ namespace RIFF {
+@@ -1575,7 +1575,7 @@ namespace RIFF {
       * @param path - path and file name of the RIFF file or RIFF-alike file to
       *               be opened
       * @param FileType - (optional) expected chunk ID of first chunk in file
@@ -255,7 +255,7 @@ Index: libgig/src/RIFF.cpp
       *                         given RIFF file or RIFF-alike file
       */
      void File::__openExistingFile(const String& path, uint32_t* FileType) {
-@@ -1771,7 +1771,7 @@ namespace RIFF {
+@@ -1777,7 +1777,7 @@ namespace RIFF {
       *
       * @param pProgress - optional: callback function for progress notification
       * @throws RIFF::Exception if there is an empty chunk or empty list
diff --git a/debian/patches/series b/debian/patches/series
index 0ced3da..9ea486f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01-Makefile.patch
 02-manpages.patch
-03-deletechuncklist.patch
 04-spelling.patch
 05-fix-include-dir.patch

-- 
libgig packaging



More information about the pkg-multimedia-commits mailing list