Merge pull request #252 from dpogue/pljpeg

Move plJPEG into plGImage.

Sources/Plasma/Apps/plClient/CMakeLists.txt

@@ -107,7 +107,6 @@ target_link_libraries(plClient plGLight)
 target_link_libraries(plClient plInputCore)
 target_link_libraries(plClient plInterp)
 target_link_libraries(plClient plIntersect)
-target_link_libraries(plClient plJPEG)
 target_link_libraries(plClient plMath)
 target_link_libraries(plClient plMessage)
 target_link_libraries(plClient plModifier)

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/pfGUITagDefs.h"
-#include "../pfGameGUIMgr/pfGUIDialogMod.h"
-#include "../pfGameGUIMgr/pfGUIControlHandlers.h"
-#include "../pfGameGUIMgr/pfGUIDialogHandlers.h"
-#include "../pfGameGUIMgr/pfGUIEditBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIListBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIButtonMod.h"
-#include "../pfGameGUIMgr/pfGUIListElement.h"
-#include "../pfGameGUIMgr/pfGUITextBoxMod.h"
-#include "../pfGameGUIMgr/pfGUIRadioGroupCtrl.h"
-
-#include "../plGImage/plDynamicTextMap.h"
-
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetKI.h"
-#include "../pnNetCommon/plNetMsg.h"
-#include "../plNetTransport/plNetTransportMember.h"
-#include "../pfMessage/pfKIMsg.h"
-#include "../plMessage/plMemberUpdateMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-
-
-#include "../pnMessage/plRemoteAvatarInfoMsg.h"
+#include "pfGameGUIMgr/pfGameGUIMgr.h"
+#include "pfGameGUIMgr/pfGUITagDefs.h"
+#include "pfGameGUIMgr/pfGUIDialogMod.h"
+#include "pfGameGUIMgr/pfGUIControlHandlers.h"
+#include "pfGameGUIMgr/pfGUIDialogHandlers.h"
+#include "pfGameGUIMgr/pfGUIEditBoxMod.h"
+#include "pfGameGUIMgr/pfGUIListBoxMod.h"
+#include "pfGameGUIMgr/pfGUIButtonMod.h"
+#include "pfGameGUIMgr/pfGUIListElement.h"
+#include "pfGameGUIMgr/pfGUITextBoxMod.h"
+#include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h"
+
+#include "plGImage/plDynamicTextMap.h"
+
+#include "plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetKI.h"
+#include "pnNetCommon/plNetMsg.h"
+#include "plNetTransport/plNetTransportMember.h"
+#include "pfMessage/pfKIMsg.h"
+#include "plMessage/plMemberUpdateMsg.h"
+#include "pnMessage/plTimeMsg.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 "../pfGameGUIMgr/pfGUICheckBoxCtrl.h"
-#include "../plMessage/plLinkToAgeMsg.h"
-#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plJPEG/plJPEG.h"
+#include "plNetCommon/plNetAvatarVault.h"
+#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h"
+#include "plMessage/plLinkToAgeMsg.h"
+#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
+#include "plGImage/plDynamicTextMap.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 "plJPEG/plJPEG.h"
+#include "plGImage/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/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"
 

Sources/Tools/MaxMain/CMakeLists.txt

@@ -145,7 +145,6 @@ target_link_libraries(MaxMain plGLight)
 target_link_libraries(MaxMain plInputCore)
 target_link_libraries(MaxMain plInterp)
 target_link_libraries(MaxMain plIntersect)
-target_link_libraries(MaxMain plJPEG)
 target_link_libraries(MaxMain plMath)
 target_link_libraries(MaxMain plMessage)
 target_link_libraries(MaxMain plModifier)

Sources/Tools/MaxPlasmaLights/CMakeLists.txt

@@ -74,7 +74,6 @@ target_link_libraries(MaxPlasmaLights plGLight)
 target_link_libraries(MaxPlasmaLights plInputCore)
 target_link_libraries(MaxPlasmaLights plInterp)
 target_link_libraries(MaxPlasmaLights plIntersect)
-target_link_libraries(MaxPlasmaLights plJPEG)
 target_link_libraries(MaxPlasmaLights plMath)
 target_link_libraries(MaxPlasmaLights plMessage)
 target_link_libraries(MaxPlasmaLights plModifier)

Sources/Tools/plFontConverter/CMakeLists.txt

@@ -27,7 +27,6 @@ target_link_libraries(plFontConverter pnKeyedObject)
 target_link_libraries(plFontConverter pnSceneObject)
 target_link_libraries(plFontConverter pnProduct)
 target_link_libraries(plFontConverter plGImage)
-target_link_libraries(plFontConverter plJPEG)
 target_link_libraries(plFontConverter plMessage)
 target_link_libraries(plFontConverter plPipeline)
 target_link_libraries(plFontConverter plResMgr)