diff --git a/dotnet/extlibs/csfml-graphics.dll b/dotnet/extlibs/csfml-graphics.dll index afdba81d..416bb64f 100644 Binary files a/dotnet/extlibs/csfml-graphics.dll and b/dotnet/extlibs/csfml-graphics.dll differ diff --git a/dotnet/src/Graphics/Image.cs b/dotnet/src/Graphics/Image.cs index b5d43019..fee23090 100644 --- a/dotnet/src/Graphics/Image.cs +++ b/dotnet/src/Graphics/Image.cs @@ -178,7 +178,7 @@ namespace SFML //////////////////////////////////////////////////////////// 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) { - 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); [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] static extern void sfImage_SetPixel(IntPtr This, uint X, uint Y, Color Col); diff --git a/include/SFML/Window/ContextSettings.hpp b/include/SFML/Window/ContextSettings.hpp index 2ddcb89e..5fc4e539 100644 --- a/include/SFML/Window/ContextSettings.hpp +++ b/include/SFML/Window/ContextSettings.hpp @@ -76,9 +76,9 @@ struct ContextSettings /// ContextSettings allows to define several advanced settings /// of the OpenGL context attached to a window. All these /// settings have no impact on the regular SFML rendering -/// (graphics module), so you may need to use this structure -/// only if you're using SFML as a windowing system for -/// custom OpenGL rendering. +/// (graphics module) -- except the anti-aliasing level, so +/// you may need to use this structure only if you're using +/// SFML as a windowing system for custom OpenGL rendering. /// /// The DepthBits and StencilBits members define the number /// of bits per pixel requested for the (respectively) depth