Move plJPEG into plGImage.

This matches what was done for plPNG.

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -1606,7 +1606,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam,
     grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor);
 }
 
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 
 PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" )
 {

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp

@@ -730,7 +730,7 @@ hsGMaterial *pfGUIPopUpMenu::ICreateDynMaterial( void )
 //// Build ///////////////////////////////////////////////////////////////////
 //  Constructs a shiny new pop-up menu at runtime, complete with trimmings
 
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 
 pfGUIPopUpMenu  *pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, float x, float y, const plLocation &destLoc )
 {

Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@@ -2491,7 +2491,7 @@ void    pfJournalBook::IFreeSource( void )
 // image name.
 
 #ifndef PLASMA_EXTERNAL_RELEASE
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plGImage/plPNG.h"
 #endif
 

Sources/Plasma/FeatureLib/pfKI/pfKI.cpp

@@ -49,30 +49,30 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 
-#include "../pfGameGUIMgr/pfGameGUIMgr.h"
+#include "pfGameGUIMgr/pfGameGUIMgr.h"
-#include "../pfGameGUIMgr/pfGUITagDefs.h"
+#include "pfGameGUIMgr/pfGUITagDefs.h"
-#include "../pfGameGUIMgr/pfGUIDialogMod.h"
+#include "pfGameGUIMgr/pfGUIDialogMod.h"
-#include "../pfGameGUIMgr/pfGUIControlHandlers.h"
+#include "pfGameGUIMgr/pfGUIControlHandlers.h"
-#include "../pfGameGUIMgr/pfGUIDialogHandlers.h"
+#include "pfGameGUIMgr/pfGUIDialogHandlers.h"
-#include "../pfGameGUIMgr/pfGUIEditBoxMod.h"
+#include "pfGameGUIMgr/pfGUIEditBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIListBoxMod.h"
+#include "pfGameGUIMgr/pfGUIListBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIButtonMod.h"
+#include "pfGameGUIMgr/pfGUIButtonMod.h"
-#include "../pfGameGUIMgr/pfGUIListElement.h"
+#include "pfGameGUIMgr/pfGUIListElement.h"
-#include "../pfGameGUIMgr/pfGUITextBoxMod.h"
+#include "pfGameGUIMgr/pfGUITextBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIRadioGroupCtrl.h"
+#include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h"
 
-#include "../plGImage/plDynamicTextMap.h"
+#include "plGImage/plDynamicTextMap.h"
 
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetKI.h"
+#include "plNetClient/plNetKI.h"
-#include "../pnNetCommon/plNetMsg.h"
+#include "pnNetCommon/plNetMsg.h"
-#include "../plNetTransport/plNetTransportMember.h"
+#include "plNetTransport/plNetTransportMember.h"
-#include "../pfMessage/pfKIMsg.h"
+#include "pfMessage/pfKIMsg.h"
-#include "../plMessage/plMemberUpdateMsg.h"
+#include "plMessage/plMemberUpdateMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
 
 
-#include "../pnMessage/plRemoteAvatarInfoMsg.h"
+#include "pnMessage/plRemoteAvatarInfoMsg.h"
 
 #define kKITempID_ListOfLists       25
 #define kKITempID_MsgDestRadio      26
@@ -1287,12 +1287,12 @@ bool    pfKI::MsgReceive( plMessage *msg )
 //// Player Book Stuff ///////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-#include "../plNetCommon/plNetAvatarVault.h"
+#include "plNetCommon/plNetAvatarVault.h"
-#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h"
+#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h"
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
+#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "plGImage/plDynamicTextMap.h"
-#include "../plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 
 //// plPlayerBookProc ////////////////////////////////////////////////////////
 

Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp

@@ -2584,7 +2584,7 @@ void cyMisc::SetAlarm( float secs, PyObject * cb, uint32_t cbContext )
 //
 // PURPOSE    : captures the screen and saves it as a jpeg
 //
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 void cyMisc::SaveScreenShot(const char* fileName, int x, int y, int quality)
 {
     if ( cyMisc::GetPipeline() )

Sources/Plasma/FeatureLib/pfPython/pyImage.cpp

@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyImage.h"
 #include "pyGeometry3.h"
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plGImage/plPNG.h"
 #include "pnKeyedObject/plUoid.h"
 

Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp

@@ -56,8 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnSceneObject/plDrawInterface.h"
 
 #include "plGImage/plMipmap.h"
-
+#include "plGImage/plJPEG.h"
-#include "plJPEG/plJPEG.h"
 
 #include "plMessage/plRenderRequestMsg.h"
 

Sources/Plasma/PubUtilLib/CMakeLists.txt

@@ -17,7 +17,6 @@ add_subdirectory(plGLight)
 add_subdirectory(plInputCore)
 add_subdirectory(plInterp)
 add_subdirectory(plIntersect)
-add_subdirectory(plJPEG)
 add_subdirectory(plMath)
 add_subdirectory(plMessage)
 add_subdirectory(plModifier)

Sources/Plasma/PubUtilLib/plClientResMgr/plClientResMgr.cpp

@@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsStream.h"
 #include "hsResMgr.h"
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plGImage/plPNG.h"
 #include "plGImage/plMipmap.h"
 

Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt

@@ -3,6 +3,9 @@ include_directories("../../NucleusLib/inc")
 include_directories("../../NucleusLib")
 include_directories("../../PubUtilLib")
 
+find_package(JPEG REQUIRED)
+include_directories(${JPEG_INCLUDE_DIR})
+
 find_package(PNG REQUIRED)
 include_directories(${PNG_INCLUDE_DIR})
 
@@ -18,6 +21,7 @@ set(plGImage_SOURCES
     plDynSurfaceWriter.cpp
     plFont.cpp
     plFontCache.cpp
+    plJPEG.cpp
     plLODMipmap.cpp
     plMipmap.cpp
     plPNG.cpp
@@ -38,6 +42,7 @@ set(plGImage_HEADERS
     plFont.h
     plFontCache.h
     plGImageCreatable.h
+    plJPEG.h
     plLODMipmap.h
     plMipmap.h
     plPNG.h
@@ -48,4 +53,4 @@ set(plGImage_HEADERS
 add_library(plGImage STATIC ${plGImage_SOURCES} ${plGImage_HEADERS})
 
 source_group("Source Files" FILES ${plGImage_SOURCES})
-source_group("Header Files" FILES ${plGImage_HEADERS})
+source_group("Header Files" FILES ${plGImage_HEADERS})

Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp

@@ -59,7 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsColorRGBA.h"
 #include "plPipeline/hsGDeviceRef.h"
 #include "plProfile.h"
-#include "plJPEG/plJPEG.h"
+#include "plJPEG.h"
 #include <math.h>
 
 plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps);

Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt

@@ -1,20 +0,0 @@
-include_directories("../../CoreLib")
-include_directories("../../NucleusLib/inc")
-include_directories("../../NucleusLib")
-include_directories("../../PubUtilLib")
-
-find_package(JPEG REQUIRED)
-include_directories(${JPEG_INCLUDE_DIR})
-
-set(plJPEG_SOURCES
-    plJPEG.cpp
-)
-
-set(plJPEG_HEADERS
-    plJPEG.h
-)
-
-add_library(plJPEG STATIC ${plJPEG_SOURCES} ${plJPEG_HEADERS})
-
-source_group("Source Files" FILES ${plJPEG_SOURCES})
-source_group("Header Files" FILES ${plJPEG_HEADERS})

Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp

@@ -1,408 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//  plJPEG - JPEG Codec Wrapper for Plasma                                   //
-//  Cyan, Inc.                                                               //
-//                                                                           //
-//// Version History //////////////////////////////////////////////////////////
-//                                                                           //
-//  2.1.2002 mcn - Created.                                                  //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-#include "HeadSpin.h"
-#include "plJPEG.h"
-#include "hsStream.h"
-#include "hsExceptions.h"
-
-#include "plGImage/plMipmap.h"
-
-#include <jpeglib.h>
-#include <jerror.h>
-
-//// Local Statics ////////////////////////////////////////////////////////////
-//  Done this way so we don't have to declare them in the .h file and pull in
-//  the platform-specific library
-
-// It is not thread-safe to use a static char buffer, but it wasn't really
-// thread-safe to use a static int either. The char buffer is slightly
-// worse since you could get mangled strings instead of just a stale error.
-static char jpegmsg[JMSG_LENGTH_MAX];
-
-// jpeglib error handlers
-static void plJPEG_error_exit( j_common_ptr cinfo )
-{
-    (*cinfo->err->format_message) ( cinfo, jpegmsg );
-    throw ( false );
-}
-static void plJPEG_emit_message( j_common_ptr cinfo, int msg_level )
-{
-    // log NOTHING
-}
-static void clear_jpegmsg()
-{
-    // "Success" is what IJL produced for no error
-    strcpy( jpegmsg, "Success" );
-}
-
-
-//// Instance /////////////////////////////////////////////////////////////////
-
-plJPEG  &plJPEG::Instance( void )
-{
-    clear_jpegmsg();
-
-    static plJPEG   theInstance;
-    return theInstance;
-}
-
-//// GetLastError /////////////////////////////////////////////////////////////
-
-const char  *plJPEG::GetLastError( void )
-{
-    return jpegmsg;
-}
-
-//// IRead ////////////////////////////////////////////////////////////////////
-//  Given an open hsStream (or a filename), reads the JPEG data off of the 
-//  stream and decodes it into a new plMipmap. The mipmap's buffer ends up 
-//  being a packed RGBx buffer, where x is 8 bits of unused alpha (go figure 
-//  that JPEG images can't store alpha, or even if they can, IJL certainly 
-//  doesn't know about it).
-//  Returns a pointer to the new mipmap if successful, nil otherwise.
-//  Note: more or less lifted straight out of the IJL documentation, with
-//  some changes to fit Plasma coding style and formats.
-
-plMipmap    *plJPEG::IRead( hsStream *inStream )
-{
-    plMipmap    *newMipmap = nil;
-    uint8_t       *jpegSourceBuffer = nil;
-    uint32_t      jpegSourceSize;
-    
-    struct jpeg_decompress_struct   cinfo;
-    struct jpeg_error_mgr       jerr;
-
-
-    clear_jpegmsg();
-    cinfo.err = jpeg_std_error( &jerr );
-    jerr.error_exit = plJPEG_error_exit;
-    jerr.emit_message = plJPEG_emit_message;
-
-    try
-    {
-        jpeg_create_decompress( &cinfo );
-
-        /// Read in the JPEG header
-        if ( inStream->GetEOF() == 0 )
-            throw( false );
-
-        /// Wonderful limitation of mixing our streams with IJL--it wants either a filename
-        /// or a memory buffer. Since we can't give it the former, we have to read the entire
-        /// JPEG stream into a separate buffer before we can decode it. Which means we ALSO
-        /// have to write/read a length of said buffer. Such is life, I guess...
-        jpegSourceSize = inStream->ReadLE32();
-        jpegSourceBuffer = new uint8_t[ jpegSourceSize ];
-        if( jpegSourceBuffer == nil )
-        {
-            // waah.
-            ERREXIT1( &cinfo, JERR_OUT_OF_MEMORY, 0 );
-        }
-
-        inStream->Read( jpegSourceSize, jpegSourceBuffer );
-        jpeg_mem_src( &cinfo, jpegSourceBuffer, jpegSourceSize );
-        (void) jpeg_read_header( &cinfo, TRUE );
-
-        /// So we got lots of data to play with now. First, set the JPEG color
-        /// space to read in from/as...
-        /// From the IJL code:
-        // "Set the JPG color space ... this will always be
-        // somewhat of an educated guess at best because JPEG
-        // is "color blind" (i.e., nothing in the bit stream
-        // tells you what color space the data was encoded from).
-        // However, in this example we assume that we are
-        // reading JFIF files which means that 3 channel images
-        // are in the YCbCr color space and 1 channel images are
-        // in the Y color space."
-
-        switch( cinfo.jpeg_color_space )
-        {
-            case JCS_GRAYSCALE:
-            case JCS_YCbCr:
-                cinfo.out_color_space = JCS_RGB;
-                break;
-
-            default:
-                // We should probably assert here, since we're pretty sure we WON'T get ARGB. <sigh>
-                hsAssert( false, "Unknown JPEG stream format in ReadFromStream()" );
-                cinfo.out_color_space = JCS_UNKNOWN;
-                break;
-        }
-
-        (void) jpeg_start_decompress( &cinfo );
-
-        /// Construct a new mipmap to hold everything
-        newMipmap = new plMipmap( cinfo.output_width, cinfo.output_height, plMipmap::kRGB32Config, 1, plMipmap::kJPEGCompression );
-
-        if( newMipmap == nil || newMipmap->GetImage() == nil )
-        {
-            ERREXIT1( &cinfo, JERR_OUT_OF_MEMORY, 0 );
-        }
-
-        /// Set up to read in to that buffer we now have
-        JSAMPROW jbuffer;
-        int row_stride = cinfo.output_width * cinfo.output_components;
-        int out_stride = cinfo.output_width * 4;  // Decompress to RGBA
-        jbuffer = new JSAMPLE[row_stride];
-
-        uint8_t *destp = (uint8_t *)newMipmap->GetImage();
-        while( cinfo.output_scanline < cinfo.output_height )
-        {
-            (void) jpeg_read_scanlines( &cinfo, &jbuffer, 1 );
-            (void) memset( destp, 0xFF, out_stride );
-            
-            for( size_t pixel = 0; pixel < cinfo.output_width; ++pixel )
-            {
-                (void) memcpy( destp + (pixel * 4),
-                               jbuffer + (pixel * cinfo.output_components),
-                               cinfo.out_color_components );
-            }
-
-            destp += out_stride;
-        }
-
-        (void) jpeg_finish_decompress(&cinfo);
-        delete [] jbuffer;
-
-        // Sometimes life just sucks
-        ISwapRGBAComponents( (uint32_t *)newMipmap->GetImage(), newMipmap->GetWidth() * newMipmap->GetHeight() );
-    }
-    catch( ... )
-    {
-        delete newMipmap;
-        newMipmap = nil;
-    }
-
-    // Cleanup
-    delete [] jpegSourceBuffer;
-
-    // Clean up the JPEG Library
-    jpeg_destroy_decompress( &cinfo );
-
-    // All done!
-    return newMipmap;
-}
-
-plMipmap*   plJPEG::ReadFromFile( const char *fileName )
-{
-    wchar_t* wFilename = hsStringToWString(fileName);
-    plMipmap* retVal = ReadFromFile(wFilename);
-    delete [] wFilename;
-    return retVal;
-}
-
-plMipmap*   plJPEG::ReadFromFile( const wchar_t *fileName )
-{
-    // we use a stream because the IJL can't handle unicode
-    hsRAMStream tempstream;
-    hsUNIXStream in;
-    if (!in.Open(fileName, L"rb"))
-        return nil;
-
-    // The stream reader for JPEGs expects a 32-bit size at the start,
-    // so insert that into the stream before passing it on
-    in.FastFwd();
-    uint32_t fsize = in.GetPosition();
-    uint8_t *tempbuffer = new uint8_t[fsize];
-    in.Rewind();
-    in.Read(fsize, tempbuffer);
-    tempstream.WriteLE32(fsize);
-    tempstream.Write(fsize, tempbuffer);
-    delete [] tempbuffer;
-    tempstream.Rewind();
-
-    plMipmap* ret = IRead(&tempstream);
-    in.Close();
-    return ret;
-}
-
-//// IWrite ///////////////////////////////////////////////////////////////////
-//  Oh, figure it out yourself. :P
-
-bool    plJPEG::IWrite( plMipmap *source, hsStream *outStream )
-{
-    bool    result = true, swapped = false;
-    uint8_t   *jpgBuffer = nil;
-    uint32_t  jpgBufferSize = 0;
-
-    struct jpeg_compress_struct cinfo;
-    struct jpeg_error_mgr       jerr;
-
-
-    clear_jpegmsg();
-    cinfo.err = jpeg_std_error( &jerr );
-    jerr.error_exit = plJPEG_error_exit;
-    jerr.emit_message = plJPEG_emit_message;
-
-    try
-    {
-        jpeg_create_compress( &cinfo );
-
-        // Create a buffer to hold the data
-        jpgBufferSize = source->GetWidth() * source->GetHeight() * 3;
-        jpgBuffer = new uint8_t[ jpgBufferSize ];
-        if( jpgBuffer == nil )
-        {
-            ERREXIT1( &cinfo, JERR_OUT_OF_MEMORY, 0 );
-        }
-
-        uint8_t *bufferAddr = jpgBuffer;
-        unsigned long bufferSize = jpgBufferSize;
-        jpeg_mem_dest( &cinfo, &bufferAddr, &bufferSize );
-
-        cinfo.image_width = source->GetWidth();
-        cinfo.image_height = source->GetHeight();
-        cinfo.input_components = 3;
-        cinfo.in_color_space = JCS_RGB;
-
-        jpeg_set_defaults( &cinfo );
-
-        cinfo.jpeg_width = source->GetWidth(); // default
-        cinfo.jpeg_height = source->GetHeight(); // default
-        cinfo.jpeg_color_space = JCS_YCbCr; // default
-        // not sure how to set 4:1:1 but supposedly it's the default
-        jpeg_set_quality( &cinfo, fWriteQuality, TRUE );
-
-        jpeg_start_compress( &cinfo, TRUE );
-
-        // Sometimes life just sucks
-        ISwapRGBAComponents( (uint32_t *)source->GetImage(), source->GetWidth() * source->GetHeight() );
-        swapped = true;
-
-        // Write it!
-        JSAMPROW jbuffer;
-        int in_stride = cinfo.image_width * 4;  // Input is always RGBA
-        int row_stride = cinfo.image_width * cinfo.input_components;
-        jbuffer = new JSAMPLE[row_stride];
-
-        uint8_t *srcp = (uint8_t *)source->GetImage();
-        while( cinfo.next_scanline < cinfo.image_height )
-        {
-            for( size_t pixel = 0; pixel < cinfo.image_width; ++pixel )
-            {
-                (void) memcpy( jbuffer + (pixel * cinfo.input_components),
-                               srcp + (pixel * 4), cinfo.input_components );
-            }
-
-            (void) jpeg_write_scanlines( &cinfo, &jbuffer, 1 );
-            srcp += in_stride;
-        }
-
-        jpeg_finish_compress( &cinfo );
-        delete [] jbuffer;
-
-        // jpeglib changes bufferSize and bufferAddr
-        outStream->WriteLE32( bufferSize );
-        outStream->Write( bufferSize, bufferAddr );
-    }
-    catch( ... )
-    {
-        result = false;
-    }
-
-    // Cleanup
-    if ( jpgBuffer )
-        delete [] jpgBuffer;
-    jpeg_destroy_compress( &cinfo );
-
-    if( swapped )
-        ISwapRGBAComponents( (uint32_t *)source->GetImage(), source->GetWidth() * source->GetHeight() );
-
-    return result;
-}
-
-bool    plJPEG::WriteToFile( const char *fileName, plMipmap *sourceData )
-{
-    wchar_t* wFilename = hsStringToWString(fileName);
-    bool retVal = WriteToFile(wFilename, sourceData);
-    delete [] wFilename;
-    return retVal;
-}
-
-bool    plJPEG::WriteToFile( const wchar_t *fileName, plMipmap *sourceData )
-{
-    // we use a stream because the IJL can't handle unicode
-    hsRAMStream tempstream;
-    hsUNIXStream out;
-    if (!out.Open(fileName, L"wb"))
-        return false;
-    bool ret = IWrite(sourceData, &tempstream);
-    if (ret)
-    {
-        // The stream writer for JPEGs prepends a 32-bit size,
-        // so remove that from the stream before saving to a file
-        tempstream.Rewind();
-        uint32_t fsize = tempstream.ReadLE32();
-        uint8_t *tempbuffer = new uint8_t[fsize];
-        tempstream.Read(fsize, tempbuffer);
-        out.Write(fsize, tempbuffer);
-
-        delete [] tempbuffer;
-    }
-    out.Close();
-    return ret;
-}
-
-//// ISwapRGBAComponents //////////////////////////////////////////////////////
-
-void    plJPEG::ISwapRGBAComponents( uint32_t *data, uint32_t count )
-{
-    while( count-- )
-    {
-        *data = ( ( ( *data ) & 0xff00ff00 )       ) |
-                ( ( ( *data ) & 0x00ff0000 ) >> 16 ) |
-//              ( ( ( *data ) & 0x0000ff00 ) << 8 ) |
-                ( ( ( *data ) & 0x000000ff ) << 16 );
-        data++;
-    }
-}
-

Sources/Plasma/PubUtilLib/plJPEG/plJPEG.h

@@ -1,92 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//  plJPEG - JPEG Codec Wrapper for Plasma                                   //
-//  Cyan, Inc.                                                               //
-//                                                                           //
-//// Version History //////////////////////////////////////////////////////////
-//                                                                           //
-//  2.1.2002 mcn - Created.                                                  //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _plJPEG_h
-#define _plJPEG_h
-
-
-//// Class Definition /////////////////////////////////////////////////////////
-
-class plMipmap;
-class hsStream;
-
-class plJPEG
-{
-    protected:
-
-        uint8_t       fWriteQuality;
-
-        // Pick one...
-        plMipmap    *IRead( hsStream *inStream );
-        bool        IWrite( plMipmap *source, hsStream *outStream );
-
-        void        ISwapRGBAComponents( uint32_t *data, uint32_t count );
-
-    public:
-
-        plMipmap    *ReadFromStream( hsStream *inStream ) { return IRead( inStream ); }
-        plMipmap    *ReadFromFile( const char *fileName );
-        plMipmap    *ReadFromFile( const wchar_t *fileName );
-
-        bool    WriteToStream( hsStream *outStream, plMipmap *sourceData ) { return IWrite( sourceData, outStream ); }
-        bool    WriteToFile( const char *fileName, plMipmap *sourceData );
-        bool    WriteToFile( const wchar_t *fileName, plMipmap *sourceData );
-
-        // Range is 0 (worst) to 100 (best)
-        void    SetWriteQuality( uint8_t q ) { fWriteQuality = q; }
-
-        const char  *GetLastError( void );
-
-        static plJPEG   &Instance( void );
-};
-
-#endif // _plJPEG_h

Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp

@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPipeline.h"
 #include "plPlates.h"
 
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plGImage/plPNG.h"
 #include "plGImage/plMipmap.h"
 #include "plSurface/plLayer.h"

Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp

@@ -70,7 +70,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // For taking screenshots
 #include "plGImage/plMipmap.h"
 #include "../../Apps/plClient/plClient.h"
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plPipeline.h"
 
 #include <algorithm>

Sources/Plasma/PubUtilLib/plVault/Pch.h

@@ -74,7 +74,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDniCoordinateInfo.h"
 #include "plGImage/plMipmap.h"
 #include "plGImage/plPNG.h"
-#include "plJPEG/plJPEG.h"
+#include "plGImage/plJPEG.h"
 #include "plMessage/plVaultNotifyMsg.h"
 #include "plNetClientComm/plNetClientComm.h"