summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-22 04:09:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-22 04:09:58 +0000
commitaef5dfa827f56b84ca48fdcf7c647fb5fb4b5455 (patch)
tree150105228066c746361758ae769ea6d525b6c91f
parentReleasing progress-linux version 1.1.0-1~dschinn1. (diff)
downloadlibheif-aef5dfa827f56b84ca48fdcf7c647fb5fb4b5455.zip
libheif-aef5dfa827f56b84ca48fdcf7c647fb5fb4b5455.tar.xz
Merging debian version 1.1.0-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/001-fix-uninitialized-variables.patch51
-rw-r--r--debian/patches/series1
3 files changed, 58 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9ec0aa8..984c9ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libheif (1.1.0-2) unstable; urgency=medium
+
+ * Add patch to fix compile errors on mips, ppc and other platforms.
+
+ -- Joachim Bauch <bauch@struktur.de> Thu, 19 Apr 2018 09:04:15 +0200
+
libheif (1.1.0-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/001-fix-uninitialized-variables.patch b/debian/patches/001-fix-uninitialized-variables.patch
new file mode 100644
index 0000000..a02e5c8
--- /dev/null
+++ b/debian/patches/001-fix-uninitialized-variables.patch
@@ -0,0 +1,51 @@
+From 019593b556d254a47c4d3e80a10e0a5755b01138 Mon Sep 17 00:00:00 2001
+From: Dirk Farin <farin@struktur.de>
+Date: Thu, 19 Apr 2018 08:48:44 +0200
+Subject: [PATCH] fix uninitialized variable compiler warning and remove debug
+ output
+
+---
+ src/heif_context.cc | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/src/heif_context.cc b/src/heif_context.cc
+index 13a1807..20c155d 100644
+--- a/src/heif_context.cc
++++ b/src/heif_context.cc
+@@ -1302,7 +1302,7 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
+ bool first=true;
+ bool eof=false;
+
+- int prev_start_code_start;
++ int prev_start_code_start = -1; // init to an invalid value, will always be overwritten before use
+ int start_code_start;
+ int ptr = 0;
+
+@@ -1335,9 +1335,7 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
+ //printf("-> state= %d\n",state);
+
+ if (ptr == (int)data.size()) {
+- printf("to end of file\n");
+ start_code_start = (int)data.size();
+- printf("end of file pos: %04x\n",(uint32_t)start_code_start);
+ dump_nal = true;
+ eof = true;
+ }
+@@ -1350,16 +1348,11 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
+ std::vector<uint8_t> nal_data;
+ size_t length = start_code_start - (prev_start_code_start+3);
+
+- printf("found start code at position: %08x (prev: %08x)\n",
+- (uint32_t)start_code_start,
+- (uint32_t)prev_start_code_start);
+-
+ nal_data.resize(length);
+
++ assert(prev_start_code_start>=0);
+ memcpy(nal_data.data(), data.data() + prev_start_code_start+3, length);
+
+- printf("read nal %02x with length %08x\n",nal_data[0], (uint32_t)length);
+-
+ int nal_type = (nal_data[0]>>1);
+
+ switch (nal_type) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bfba9ad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001-fix-uninitialized-variables.patch