forked from hasufell/hasufell-repository
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
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
|
||
|
|
|