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

[Matteo F. Vescovi]

The following commit has been merged in the master branch:
commit f65e4d35eb773f57868c7bf9a1813be7c677b992
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu Oct 3 16:15:17 2013 +0200

    debian/patches/: patchset updated
    
    - 0005-Fix_compiler_error_on_mips.patch dropped
      (applied upstream)

diff --git a/debian/patches/0005-Fix_compiler_error_on_mips.patch b/debian/patches/0005-Fix_compiler_error_on_mips.patch
deleted file mode 100644
index c2718da..0000000
--- a/debian/patches/0005-Fix_compiler_error_on_mips.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 69a33b3..a340afe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 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