mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-29 06:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed errors caused by the last commit in the network module, and fixed minor warnings in the graphics module, on Linux

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1476 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2010-03-23 11:15:39 +00:00
parent 9280771665
commit fd8fa4e2f8
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SFML/Graphics/Font.cpp
View File

@ -49,12 +49,13 @@ myCurrentSize(0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Font::Font(const Font& copy) : Font::Font(const Font& copy) :
myLibrary (copy.myLibrary), Resource<Font>(),
myFace (copy.myFace), myLibrary (copy.myLibrary),
myRefCount (copy.myRefCount), myFace (copy.myFace),
myPages (copy.myPages), myRefCount (copy.myRefCount),
myPixelBuffer(copy.myPixelBuffer), myPages (copy.myPages),
myCurrentSize(copy.myCurrentSize) myPixelBuffer (copy.myPixelBuffer),
myCurrentSize (copy.myCurrentSize)
{ {
// Note: as FreeType doesn't provide functions for copying/cloning, // Note: as FreeType doesn't provide functions for copying/cloning,
// we must share all the FreeType pointers // we must share all the FreeType pointers

3
src/SFML/Graphics/Image.cpp
View File

@ -59,7 +59,8 @@ myPixelsFlipped (false)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Copy constructor /// Copy constructor
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Image::Image(const Image& copy) Image::Image(const Image& copy) :
Resource<Image>()
{ {
// First make sure that the source image is up-to-date // First make sure that the source image is up-to-date
copy.EnsureArrayUpdate(); copy.EnsureArrayUpdate();

1
src/SFML/Network/TcpSocket.cpp
View File

@ -31,6 +31,7 @@
#include <SFML/Network/SocketImpl.hpp> #include <SFML/Network/SocketImpl.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <algorithm> #include <algorithm>
#include <string.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro

1
src/SFML/Network/UdpSocket.cpp
View File

@ -31,6 +31,7 @@
#include <SFML/Network/SocketImpl.hpp> #include <SFML/Network/SocketImpl.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <algorithm> #include <algorithm>
#include <string.h>
namespace sf namespace sf