Browse Source

Some fixes for compiler errors found on GCC/Linux

Michael Hansen 9 years ago
parent
commit
00be10cdbf
  1. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
  2. 1
      Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plGImage/plJPEG.cpp

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp

@ -544,7 +544,7 @@ PF_CONSOLE_CMD( Net, // groupName
"returns the age of the age" ) // helpString
{
PrintStringF(PrintString, "Current age is %s, elapsed time since birth = %f secs",
NetCommGetAge()->ageDatasetName, plNetClientMgr::GetInstance()->GetCurrentAgeElapsedSeconds());
NetCommGetAge()->ageDatasetName.c_str(), plNetClientMgr::GetInstance()->GetCurrentAgeElapsedSeconds());
}
PF_CONSOLE_CMD( Net, DownloadViaManifest,

1
Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp

@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <Python.h>
#pragma hdrstop
#include "pyGlueHelpers.h"
#include "cyAccountManagement.h"
#include "plNetClientComm/plNetClientComm.h"

2
Sources/Plasma/PubUtilLib/plGImage/plJPEG.cpp

@ -298,8 +298,10 @@ bool plJPEG::IWrite( plMipmap *source, hsStream *outStream )
jpeg_set_defaults( &cinfo );
#if JPEG_LIB_VERSION >= 70
cinfo.jpeg_width = source->GetWidth(); // default
cinfo.jpeg_height = source->GetHeight(); // default
#endif
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 );

Loading…
Cancel
Save