diff --git a/src/cocoa_gamma.c b/src/cocoa_gamma.c index fb3d2f9d..d4a25f1d 100644 --- a/src/cocoa_gamma.c +++ b/src/cocoa_gamma.c @@ -52,7 +52,7 @@ void _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp) values + size * 2, &size); - _glfwAllocGammaRamp(ramp, size); + _glfwAllocGammaArrays(ramp, size); for (i = 0; i < size; i++) { diff --git a/src/gamma.c b/src/gamma.c index 2ee83a9b..24745c14 100644 --- a/src/gamma.c +++ b/src/gamma.c @@ -42,7 +42,7 @@ ////// GLFW internal API ////// ////////////////////////////////////////////////////////////////////////// -void _glfwAllocGammaRamp(GLFWgammaramp* ramp, unsigned int size) +void _glfwAllocGammaArrays(GLFWgammaramp* ramp, unsigned int size) { ramp->red = (unsigned short*) calloc(size, sizeof(unsigned short)); ramp->green = (unsigned short*) calloc(size, sizeof(unsigned short)); @@ -50,7 +50,7 @@ void _glfwAllocGammaRamp(GLFWgammaramp* ramp, unsigned int size) ramp->size = size; } -void _glfwFreeGammaRamp(GLFWgammaramp* ramp) +void _glfwFreeGammaArrays(GLFWgammaramp* ramp) { free(ramp->red); free(ramp->green); @@ -111,7 +111,7 @@ GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* handle) _GLFW_REQUIRE_INIT_OR_RETURN(NULL); - _glfwFreeGammaRamp(&monitor->currentRamp); + _glfwFreeGammaArrays(&monitor->currentRamp); _glfwPlatformGetGammaRamp(monitor, &monitor->currentRamp); return &monitor->currentRamp; diff --git a/src/internal.h b/src/internal.h index b5655620..677b8c67 100644 --- a/src/internal.h +++ b/src/internal.h @@ -735,11 +735,11 @@ GLboolean _glfwIsValidContext(_GLFWwndconfig* wndconfig); /*! @ingroup utility */ -void _glfwAllocGammaRamp(GLFWgammaramp* ramp, unsigned int size); +void _glfwAllocGammaArrays(GLFWgammaramp* ramp, unsigned int size); /*! @ingroup utility */ -void _glfwFreeGammaRamp(GLFWgammaramp* ramp); +void _glfwFreeGammaArrays(GLFWgammaramp* ramp); /*! @ingroup utility */ diff --git a/src/monitor.c b/src/monitor.c index 97aa9ba6..2107e070 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -193,8 +193,8 @@ void _glfwDestroyMonitor(_GLFWmonitor* monitor) if (monitor == NULL) return; - _glfwFreeGammaRamp(&monitor->originalRamp); - _glfwFreeGammaRamp(&monitor->currentRamp); + _glfwFreeGammaArrays(&monitor->originalRamp); + _glfwFreeGammaArrays(&monitor->currentRamp); free(monitor->modes); free(monitor->name); diff --git a/src/win32_gamma.c b/src/win32_gamma.c index 05a65826..b64c896d 100644 --- a/src/win32_gamma.c +++ b/src/win32_gamma.c @@ -50,7 +50,7 @@ void _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp) GetDeviceGammaRamp(dc, values); DeleteDC(dc); - _glfwAllocGammaRamp(ramp, 256); + _glfwAllocGammaArrays(ramp, 256); memcpy(ramp->red, values + 0, 256 * sizeof(unsigned short)); memcpy(ramp->green, values + 256, 256 * sizeof(unsigned short)); diff --git a/src/x11_gamma.c b/src/x11_gamma.c index aad0888d..6bcdfe59 100644 --- a/src/x11_gamma.c +++ b/src/x11_gamma.c @@ -79,7 +79,7 @@ void _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp) XRRCrtcGamma* gamma = XRRGetCrtcGamma(_glfw.x11.display, monitor->x11.crtc); - _glfwAllocGammaRamp(ramp, size); + _glfwAllocGammaArrays(ramp, size); memcpy(ramp->red, gamma->red, size * sizeof(unsigned short)); memcpy(ramp->green, gamma->green, size * sizeof(unsigned short)); @@ -92,7 +92,7 @@ void _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp) int size; XF86VidModeGetGammaRampSize(_glfw.x11.display, _glfw.x11.screen, &size); - _glfwAllocGammaRamp(ramp, size); + _glfwAllocGammaArrays(ramp, size); XF86VidModeGetGammaRamp(_glfw.x11.display, _glfw.x11.screen,