From af6af9e42fdf3ce9745fd8df7b06ee2beb014f50 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Sat, 10 Jan 2015 00:48:23 +0300
Subject: [PATCH] openimageio: Update to 1.4.15

---
 mingw-w64-openimageio/PKGBUILD            | 15 ++++++---------
 mingw-w64-openimageio/fix-mingw-w64.patch | 12 ++++++++++++
 mingw-w64-openimageio/giflib.patch        | 11 -----------
 3 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 mingw-w64-openimageio/giflib.patch

diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD
index b238e65f00..d209b69019 100644
--- a/mingw-w64-openimageio/PKGBUILD
+++ b/mingw-w64-openimageio/PKGBUILD
@@ -2,8 +2,8 @@
 
 _realname=openimageio
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.4.13
-pkgrel=2
+pkgver=1.4.15
+pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)"
 arch=('any')
 url="http://www.openimageio.org/"
@@ -35,18 +35,15 @@ optdepends=(#"${MINGW_PACKAGE_PREFIX}-qt4: iv image viewer"
 options=('strip' 'buildflags')
 source=(https://github.com/OpenImageIO/oiio/archive/Release-$pkgver.tar.gz
         fix-mingw-w64.patch
-        workaround-ansidecl-h-PTR-define-conflict.patch
-        giflib.patch)
-md5sums=('7df68cad0f79f5eea33209f63b2e8b3d'
-         'cbd33e44aa073bb58b0371d311e0fc36'
-         '1bf4c840ee73d37ebdfc98d3ea527ed4'
-         'f5cef862b0700c80cb574bfec9625b85')
+        workaround-ansidecl-h-PTR-define-conflict.patch)
+md5sums=('8911cf6103e9fe3638912908bb4faa19'
+         'babd1767de324a53cb50d2a74a1ac2ae'
+         '1bf4c840ee73d37ebdfc98d3ea527ed4')
 
 prepare() {
   cd ${srcdir}/oiio-Release-${pkgver}
   patch -p1 -i ${srcdir}/fix-mingw-w64.patch
   patch -p1 -i ${srcdir}/workaround-ansidecl-h-PTR-define-conflict.patch
-  patch -p1 -i ${srcdir}/giflib.patch
 }
 
 build() {
diff --git a/mingw-w64-openimageio/fix-mingw-w64.patch b/mingw-w64-openimageio/fix-mingw-w64.patch
index a819aa39c3..65d0f18b59 100644
--- a/mingw-w64-openimageio/fix-mingw-w64.patch
+++ b/mingw-w64-openimageio/fix-mingw-w64.patch
@@ -102,6 +102,18 @@
  
  #include "imagebuf.h"
  #include "imagebufalgo.h"
+@@ -1313,9 +1313,9 @@
+         if (error)
+             continue;  // ignore errors
+         // now, draw to our target surface
+-        for (int j = 0;  j < slot->bitmap.rows; ++j) {
++        for (unsigned int j = 0;  j < slot->bitmap.rows; ++j) {
+             int ry = y + j - slot->bitmap_top;
+-            for (int i = 0;  i < slot->bitmap.width; ++i) {
++            for (unsigned int i = 0;  i < slot->bitmap.width; ++i) {
+                 int rx = x + i + slot->bitmap_left;
+                 float b = slot->bitmap.buffer[slot->bitmap.pitch*j+i] / 255.0f;
+                 R.getpixel (rx, ry, pixelcolor);
 --- a/src/libOpenImageIO/imageinput.cpp
 +++ b/src/libOpenImageIO/imageinput.cpp
 @@ -32,6 +32,7 @@
diff --git a/mingw-w64-openimageio/giflib.patch b/mingw-w64-openimageio/giflib.patch
deleted file mode 100644
index 2871f696d1..0000000000
--- a/mingw-w64-openimageio/giflib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- oiio-Release-1.4.8/src/gif.imageio/gifinput.cpp.orig	2014-05-23 20:21:53.000000000 +0400
-+++ oiio-Release-1.4.8/src/gif.imageio/gifinput.cpp	2014-05-29 09:37:42.109200000 +0400
-@@ -437,7 +437,7 @@
- GIFInput::close (void)
- {
-     if (m_gif_file) {
--        if (DGifCloseFile (m_gif_file) == GIF_ERROR) {
-+        if (DGifCloseFile (m_gif_file, NULL) == GIF_ERROR) {
-             error ("Error trying to close the file.");
-             return false;
-         }