From 83a4f6bfce764545f07276ddf27bddea624db739 Mon Sep 17 00:00:00 2001 From: Zrax Date: Wed, 6 Apr 2011 20:58:40 -0700 Subject: [PATCH] Backed out changeset 35c300baf2a4 I was using an incompatible version of libjpeg-8c. We will either need to use the rgba-patched version or update the code to work correctly with vanilla. I vote for the latter, since it will make porting easier... --- .../Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp index c1a08d94..a97d9cc1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp @@ -222,7 +222,7 @@ plMipmap *plJPEG::IRead( hsStream *inStream ) #else case JCS_GRAYSCALE: case JCS_YCbCr: - cinfo.out_color_space = JCS_RGB; + cinfo.out_color_space = JCS_RGBA; break; #endif @@ -389,7 +389,7 @@ hsBool plJPEG::IWrite( plMipmap *source, hsStream *outStream ) cinfo.image_width = source->GetWidth(); cinfo.image_height = source->GetHeight(); cinfo.input_components = 4; - cinfo.in_color_space = JCS_RGB; + cinfo.in_color_space = JCS_RGBA; jpeg_set_defaults( &cinfo ); #endif