dev-games/OpenSceneGraph: bump to 3.4.0

Change-Id: Idaab88f1020ea3b4959a96595188f51a9db33182
Reviewed-on: https://galileo.mailstation.de/gerrit/5229
Reviewed-by: Jenkins <wk@mailstation.de>
Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
This commit is contained in:
2016-03-16 22:00:33 +01:00
parent 062c545c2b
commit 5b7c2ab9d5
2 changed files with 119 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
From a20af6ee2e4b666fec79c2f545e548bd9470bbe6 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Wed, 16 Mar 2016 21:51:29 +0100
Subject: [PATCH] Fix wrong jpeg boolean handling
Upstream: reported only https://github.com/openscenegraph/OpenSceneGraph/issues/58
---
src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
index dd681e8..73480fb 100644
--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
@@ -70,14 +70,6 @@ namespace osgDBJPEG
static int jpegerror = ERR_NO_ERROR;
-/* Some versions of jmorecfg.h define boolean, some don't...
- Those that do also define HAVE_BOOLEAN, so we can guard using that. */
-#ifndef HAVE_BOOLEAN
- typedef int boolean;
- #define FALSE 0
- #define TRUE 1
-#endif
-
/* CODE FOR READING/WRITING JPEG FROM STREAMS
* This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source)
* and modified to use a std::istream/ostream* instead of a FILE*
--
2.7.3