[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.2.1_dfsg0-2-3-g2bc88cb

Matteo F. Vescovi mfv.debian at gmail.com
Wed Aug 14 12:27:49 UTC 2013


The following commit has been merged in the master branch:
commit 06951daf639ee5d96965b5b26c3f2082918deb06
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Aug 14 12:15:11 2013 +0200

    debian/patches/: patchset updated
    
    - 0005-Fix_compiler_error_on_mips.patch added

diff --git a/debian/patches/0005-Fix_compiler_error_on_mips.patch b/debian/patches/0005-Fix_compiler_error_on_mips.patch
new file mode 100644
index 0000000..c2718da
--- /dev/null
+++ b/debian/patches/0005-Fix_compiler_error_on_mips.patch
@@ -0,0 +1,27 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Wed, 14 Aug 2013 12:13:47 +0200
+Subject: Fix_compiler_error_on_mips
+
+---
+ src/oiiotool/imagerec.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/oiiotool/imagerec.cpp b/src/oiiotool/imagerec.cpp
+index 1705209..27fde18 100644
+--- a/src/oiiotool/imagerec.cpp
++++ b/src/oiiotool/imagerec.cpp
+@@ -71,10 +71,10 @@ ImageRec::ImageRec (const std::string &name, int nsubimages,
+     int specnum = 0;
+     m_subimages.resize (nsubimages);
+     for (int s = 0;  s < nsubimages;  ++s) {
+-        int mips = miplevels ? miplevels[s] : 1;
+-        m_subimages[s].m_miplevels.resize (mips);
+-        m_subimages[s].m_specs.resize (mips);
+-        for (int m = 0;  m < mips;  ++m) {
++        int nmips = miplevels ? miplevels[s] : 1;
++        m_subimages[s].m_miplevels.resize (nmips);
++        m_subimages[s].m_specs.resize (nmips);
++        for (int m = 0;  m < nmips;  ++m) {
+             ImageBuf *ib = specs ? new ImageBuf (name, specs[specnum])
+                                  : new ImageBuf (name);
+             m_subimages[s].m_miplevels[m].reset (ib);
diff --git a/debian/patches/series b/debian/patches/series
index a340afe..69a33b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix_IlmBase_issue.patch
 0003-Fix_multiarch_paths.patch
 0004-Fix_FTBFS_on_atomic_operations.patch
+0005-Fix_compiler_error_on_mips.patch

-- 
OpenImageIO packaging



More information about the Pkg-phototools-commits mailing list