mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug with Image.Copy in SFML.Net (was calling the wrong CSFML function)

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1521 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-05-21 19:13:50 +00:00
parent aaf080368b
commit d48c7ff18c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dotnet/extlibs/csfml-graphics.dll
View File

Binary file not shown.

6
dotnet/src/Graphics/Image.cs
View File

@ -178,7 +178,7 @@ namespace SFML
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
public void Copy(Image source, uint destX, uint destY) public void Copy(Image source, uint destX, uint destY)
{ {
sfImage_Copy(This, source.This, destX, destY, new IntRect(0, 0, 0, 0)); Copy(source, destX, destY, new IntRect(0, 0, 0, 0));
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -194,7 +194,7 @@ namespace SFML
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
public void Copy(Image source, uint destX, uint destY, IntRect sourceRect) public void Copy(Image source, uint destX, uint destY, IntRect sourceRect)
{ {
sfImage_Copy(This, source.This, destX, destY, sourceRect); sfImage_CopyImage(This, source.This, destX, destY, sourceRect);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -414,7 +414,7 @@ namespace SFML
static extern bool sfImage_CopyScreen(IntPtr This, IntPtr Window, IntRect SourceRect); static extern bool sfImage_CopyScreen(IntPtr This, IntPtr Window, IntRect SourceRect);
[DllImport("csfml-graphics", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] [DllImport("csfml-graphics", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfImage_Copy(IntPtr This, IntPtr Source, uint DestX, uint DestY, IntRect SourceRect); static extern void sfImage_CopyImage(IntPtr This, IntPtr Source, uint DestX, uint DestY, IntRect SourceRect);
[DllImport("csfml-graphics", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] [DllImport("csfml-graphics", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfImage_SetPixel(IntPtr This, uint X, uint Y, Color Col); static extern void sfImage_SetPixel(IntPtr This, uint X, uint Y, Color Col);

6
include/SFML/Window/ContextSettings.hpp
View File

@ -76,9 +76,9 @@ struct ContextSettings
/// ContextSettings allows to define several advanced settings /// ContextSettings allows to define several advanced settings
/// of the OpenGL context attached to a window. All these /// of the OpenGL context attached to a window. All these
/// settings have no impact on the regular SFML rendering /// settings have no impact on the regular SFML rendering
/// (graphics module), so you may need to use this structure /// (graphics module) -- except the anti-aliasing level, so
/// only if you're using SFML as a windowing system for /// you may need to use this structure only if you're using
/// custom OpenGL rendering. /// SFML as a windowing system for custom OpenGL rendering.
/// ///
/// The DepthBits and StencilBits members define the number /// The DepthBits and StencilBits members define the number
/// of bits per pixel requested for the (respectively) depth /// of bits per pixel requested for the (respectively) depth