aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-08-28 15:18:38 +0200
committerMattias Andrée <maandree@operamail.com>2014-08-28 15:18:38 +0200
commit9ccc965782253ea4847ed784b9c6cb5c5b1f8ef5 (patch)
tree32386de8407b95650998dfbbf1350094d2663711
parentm doc (diff)
downloadlibgamma-9ccc965782253ea4847ed784b9c6cb5c5b1f8ef5.tar.gz
libgamma-9ccc965782253ea4847ed784b9c6cb5c5b1f8ef5.tar.bz2
libgamma-9ccc965782253ea4847ed784b9c6cb5c5b1f8ef5.tar.xz
ramps => ramps16
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--src/lib/gamma-dummy.c8
-rw-r--r--src/lib/gamma-dummy.h8
-rw-r--r--src/lib/gamma-helper.h2
-rw-r--r--src/lib/gamma-linux-drm.c8
-rw-r--r--src/lib/gamma-linux-drm.h8
-rw-r--r--src/lib/gamma-w32-gdi.c8
-rw-r--r--src/lib/gamma-w32-gdi.h8
-rw-r--r--src/lib/gamma-x-randr.c8
-rw-r--r--src/lib/gamma-x-randr.h8
-rw-r--r--src/lib/gamma-x-vidmode.c8
-rw-r--r--src/lib/gamma-x-vidmode.h8
-rw-r--r--src/lib/libgamma-facade.c.gpp16
-rw-r--r--src/lib/libgamma-facade.h18
-rw-r--r--src/lib/libgamma-method.c6
-rw-r--r--src/lib/libgamma-method.h10
-rw-r--r--src/test/test.c26
16 files changed, 79 insertions, 79 deletions
diff --git a/src/lib/gamma-dummy.c b/src/lib/gamma-dummy.c
index 86768e5..ccde8cc 100644
--- a/src/lib/gamma-dummy.c
+++ b/src/lib/gamma-dummy.c
@@ -729,8 +729,8 @@ int libgamma_dummy_get_crtc_information(libgamma_crtc_information_t* restrict th
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_dummy_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_dummy_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
}
@@ -743,8 +743,8 @@ int libgamma_dummy_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_dummy_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_dummy_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
}
diff --git a/src/lib/gamma-dummy.h b/src/lib/gamma-dummy.h
index 3367ebd..e64dc02 100644
--- a/src/lib/gamma-dummy.h
+++ b/src/lib/gamma-dummy.h
@@ -143,8 +143,8 @@ int libgamma_dummy_get_crtc_information(libgamma_crtc_information_t* restrict th
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_dummy_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_dummy_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -154,8 +154,8 @@ int libgamma_dummy_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_dummy_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps);
+int libgamma_dummy_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps);
/**
diff --git a/src/lib/gamma-helper.h b/src/lib/gamma-helper.h
index 8b6a0c2..48f4de5 100644
--- a/src/lib/gamma-helper.h
+++ b/src/lib/gamma-helper.h
@@ -30,7 +30,7 @@ typedef union libgamma_gamma_ramps_any
/**
* 16-bit gamma ramps.
*/
- libgamma_gamma_ramps_t bits16;
+ libgamma_gamma_ramps16_t bits16;
/**
* 32-bit gamma ramps.
diff --git a/src/lib/gamma-linux-drm.c b/src/lib/gamma-linux-drm.c
index 996c76a..170f86c 100644
--- a/src/lib/gamma-linux-drm.c
+++ b/src/lib/gamma-linux-drm.c
@@ -823,8 +823,8 @@ int libgamma_linux_drm_get_crtc_information(libgamma_crtc_information_t* restric
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_linux_drm_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_linux_drm_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
libgamma_drm_card_data_t* restrict card = this->partition->data;
int r;
@@ -849,8 +849,8 @@ int libgamma_linux_drm_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_linux_drm_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_linux_drm_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
libgamma_drm_card_data_t* restrict card = this->partition->data;
int r;
diff --git a/src/lib/gamma-linux-drm.h b/src/lib/gamma-linux-drm.h
index b473463..1bde3ce 100644
--- a/src/lib/gamma-linux-drm.h
+++ b/src/lib/gamma-linux-drm.h
@@ -143,8 +143,8 @@ int libgamma_linux_drm_get_crtc_information(libgamma_crtc_information_t* restric
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_linux_drm_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_linux_drm_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -154,8 +154,8 @@ int libgamma_linux_drm_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_linux_drm_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps);
+int libgamma_linux_drm_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps);
#endif
diff --git a/src/lib/gamma-w32-gdi.c b/src/lib/gamma-w32-gdi.c
index cce5d6c..c5e3241 100644
--- a/src/lib/gamma-w32-gdi.c
+++ b/src/lib/gamma-w32-gdi.c
@@ -319,8 +319,8 @@ int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t* restrict
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_w32_gdi_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
#ifdef DEBUG
/* Windows GDI have fixed gamma ramp sizes. */
@@ -344,8 +344,8 @@ int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_w32_gdi_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_w32_gdi_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
#ifdef DEBUG
/* Windows GDI have fixed gamma ramp sizes. */
diff --git a/src/lib/gamma-w32-gdi.h b/src/lib/gamma-w32-gdi.h
index d75cb2f..025470c 100644
--- a/src/lib/gamma-w32-gdi.h
+++ b/src/lib/gamma-w32-gdi.h
@@ -143,8 +143,8 @@ int libgamma_w32_gdi_get_crtc_information(libgamma_crtc_information_t* restrict
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_w32_gdi_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -154,8 +154,8 @@ int libgamma_w32_gdi_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_w32_gdi_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps);
+int libgamma_w32_gdi_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps);
#endif
diff --git a/src/lib/gamma-x-randr.c b/src/lib/gamma-x-randr.c
index 78695c5..013b4cb 100644
--- a/src/lib/gamma-x-randr.c
+++ b/src/lib/gamma-x-randr.c
@@ -903,8 +903,8 @@ int libgamma_x_randr_get_crtc_information(libgamma_crtc_information_t* restrict
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_randr_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_x_randr_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
xcb_connection_t* restrict connection = this->partition->site->data;
xcb_randr_get_crtc_gamma_cookie_t cookie;
@@ -951,8 +951,8 @@ int libgamma_x_randr_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_randr_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_x_randr_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
xcb_connection_t* restrict connection = this->partition->site->data;
xcb_void_cookie_t cookie;
diff --git a/src/lib/gamma-x-randr.h b/src/lib/gamma-x-randr.h
index 48c4291..28ef507 100644
--- a/src/lib/gamma-x-randr.h
+++ b/src/lib/gamma-x-randr.h
@@ -143,8 +143,8 @@ int libgamma_x_randr_get_crtc_information(libgamma_crtc_information_t* restrict
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_randr_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_x_randr_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -154,8 +154,8 @@ int libgamma_x_randr_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_randr_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps);
+int libgamma_x_randr_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps);
#endif
diff --git a/src/lib/gamma-x-vidmode.c b/src/lib/gamma-x-vidmode.c
index a9db2ea..92e328f 100644
--- a/src/lib/gamma-x-vidmode.c
+++ b/src/lib/gamma-x-vidmode.c
@@ -267,8 +267,8 @@ int libgamma_x_vidmode_get_crtc_information(libgamma_crtc_information_t* restric
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_x_vidmode_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
#ifdef DEBUG
/* Gamma ramp sizes are identical but not fixed. */
@@ -292,8 +292,8 @@ int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_vidmode_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_x_vidmode_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
#ifdef DEBUG
/* Gamma ramp sizes are identical but not fixed. */
diff --git a/src/lib/gamma-x-vidmode.h b/src/lib/gamma-x-vidmode.h
index 7819d2f..a017c65 100644
--- a/src/lib/gamma-x-vidmode.h
+++ b/src/lib/gamma-x-vidmode.h
@@ -143,8 +143,8 @@ int libgamma_x_vidmode_get_crtc_information(libgamma_crtc_information_t* restric
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_x_vidmode_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -154,8 +154,8 @@ int libgamma_x_vidmode_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_x_vidmode_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps);
+int libgamma_x_vidmode_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps);
#endif
diff --git a/src/lib/libgamma-facade.c.gpp b/src/lib/libgamma-facade.c.gpp
index 349a63e..8527b3b 100644
--- a/src/lib/libgamma-facade.c.gpp
+++ b/src/lib/libgamma-facade.c.gpp
@@ -678,8 +678,8 @@ unsigned char* libgamma_unhex_edid(const char* restrict edid)
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps)
+int libgamma_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps)
{
#ifdef HAVE_NO_LIBGAMMA_METHODS
(void) ramps;
@@ -691,7 +691,7 @@ int libgamma_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
$>for method in $(get-methods | grep -v QUARTZ_CORE_GRAPHICS); do
#ifdef HAVE_LIBGAMMA_METHOD_${method}
case LIBGAMMA_METHOD_${method}:
- return libgamma_$(lowercase $method)_crtc_get_gamma_ramps(this, ramps);
+ return libgamma_$(lowercase $method)_crtc_get_gamma_ramps16(this, ramps);
#endif
/* The Quartz/CoreGraphics method uses single precision float. */
@@ -721,8 +721,8 @@ $>done
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps)
+int libgamma_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps)
{
#ifdef HAVE_NO_LIBGAMMA_METHODS
(void) ramps;
@@ -734,7 +734,7 @@ int libgamma_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
$>for method in $(get-methods | grep -v QUARTZ_CORE_GRAPHICS); do
#ifdef HAVE_LIBGAMMA_METHOD_${method}
case LIBGAMMA_METHOD_${method}:
- return libgamma_$(lowercase $method)_crtc_set_gamma_ramps(this, ramps);
+ return libgamma_$(lowercase $method)_crtc_set_gamma_ramps16(this, ramps);
#endif
$>done
@@ -812,7 +812,7 @@ $>fi
default:
ramps_.${type} = ${p}ramps;
return libgamma_translated_ramp_${action}(this, ${p:+&}ramps_, ${bits}, 16,
- libgamma_crtc_${action}_gamma_ramps);
+ libgamma_crtc_${action}_gamma_ramps16);
}
}
$>}
@@ -988,7 +988,7 @@ $>}
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-$>crtc_set_gamma_ramps_f uint16_t ramps
+$>crtc_set_gamma_ramps_f uint16_t ramps16
/**
diff --git a/src/lib/libgamma-facade.h b/src/lib/libgamma-facade.h
index 89c166a..cfcf085 100644
--- a/src/lib/libgamma-facade.h
+++ b/src/lib/libgamma-facade.h
@@ -36,7 +36,7 @@
* @param encoding [0, 1] float encoding value.
* @return [0, 2¹⁶ − 1] integer output value.
*/
-typedef uint16_t libgamma_gamma_ramps_fun(float encoding);
+typedef uint16_t libgamma_gamma_ramps16_fun(float encoding);
/**
* Mapping function from [0, 1] float encoding value to [0, 2³² − 1] integer output value.
@@ -323,8 +323,8 @@ unsigned char* libgamma_unhex_edid(const char* restrict edid);
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t* restrict ramps);
+int libgamma_crtc_get_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t* restrict ramps);
/**
* Set the gamma ramps for a CRTC, 16-bit gamma-depth version.
@@ -334,8 +334,8 @@ int libgamma_crtc_get_gamma_ramps(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_crtc_set_gamma_ramps(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_t ramps) __attribute__((hot));
+int libgamma_crtc_set_gamma_ramps16(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_t ramps) __attribute__((hot));
/**
@@ -442,10 +442,10 @@ int libgamma_crtc_set_gamma_rampsd(libgamma_crtc_state_t* restrict this,
* @return Zero on success, otherwise (negative) the value of an
* error identifier provided by this library.
*/
-int libgamma_crtc_set_gamma_ramps_f(libgamma_crtc_state_t* restrict this,
- libgamma_gamma_ramps_fun* red_function,
- libgamma_gamma_ramps_fun* green_function,
- libgamma_gamma_ramps_fun* blue_function) __attribute__((cold));
+int libgamma_crtc_set_gamma_ramps16_f(libgamma_crtc_state_t* restrict this,
+ libgamma_gamma_ramps16_fun* red_function,
+ libgamma_gamma_ramps16_fun* green_function,
+ libgamma_gamma_ramps16_fun* blue_function) __attribute__((cold));
/**
* Set the gamma ramps for a CRTC, 32-bit gamma-depth function version.
diff --git a/src/lib/libgamma-method.c b/src/lib/libgamma-method.c
index d51415d..7311de4 100644
--- a/src/lib/libgamma-method.c
+++ b/src/lib/libgamma-method.c
@@ -34,7 +34,7 @@
* @param this The gamma ramps.
* @return Zero on success, -1 on allocation error, `errno` will be set accordingly.
*/
-int libgamma_gamma_ramps_initialise(libgamma_gamma_ramps_t* restrict this)
+int libgamma_gamma_ramps16_initialise(libgamma_gamma_ramps16_t* restrict this)
{
size_t n = this->red_size + this->green_size + this->blue_size;
#ifdef HAVE_LIBGAMMA_METHOD_LINUX_DRM
@@ -56,7 +56,7 @@ int libgamma_gamma_ramps_initialise(libgamma_gamma_ramps_t* restrict this)
*
* @param this The gamma ramps.
*/
-void libgamma_gamma_ramps_destroy(libgamma_gamma_ramps_t* restrict this)
+void libgamma_gamma_ramps16_destroy(libgamma_gamma_ramps16_t* restrict this)
{
free(this->red);
}
@@ -70,7 +70,7 @@ void libgamma_gamma_ramps_destroy(libgamma_gamma_ramps_t* restrict this)
*
* @param this The gamma ramps.
*/
-void libgamma_gamma_ramps_free(libgamma_gamma_ramps_t* restrict this)
+void libgamma_gamma_ramps16_free(libgamma_gamma_ramps16_t* restrict this)
{
free(this->red);
free(this);
diff --git a/src/lib/libgamma-method.h b/src/lib/libgamma-method.h
index 5d2ae32..b549a5d 100644
--- a/src/lib/libgamma-method.h
+++ b/src/lib/libgamma-method.h
@@ -864,7 +864,7 @@ typedef struct libgamma_crtc_information
/**
* Gamma ramp structure for 16-bit gamma ramps.
*/
-typedef struct libgamma_gamma_ramps
+typedef struct libgamma_gamma_ramps16
{
/**
* The size of `red`.
@@ -896,7 +896,7 @@ typedef struct libgamma_gamma_ramps
*/
uint16_t* blue;
-} libgamma_gamma_ramps_t;
+} libgamma_gamma_ramps16_t;
/**
@@ -1062,7 +1062,7 @@ typedef struct libgamma_gamma_rampsd
* @param this The gamma ramps.
* @return Zero on success, -1 on allocation error, `errno` will be set accordingly.
*/
-int libgamma_gamma_ramps_initialise(libgamma_gamma_ramps_t* restrict this);
+int libgamma_gamma_ramps16_initialise(libgamma_gamma_ramps16_t* restrict this);
/**
* Release resources that are held by a gamma ramp strcuture that
@@ -1071,7 +1071,7 @@ int libgamma_gamma_ramps_initialise(libgamma_gamma_ramps_t* restrict this);
*
* @param this The gamma ramps.
*/
-void libgamma_gamma_ramps_destroy(libgamma_gamma_ramps_t* restrict this);
+void libgamma_gamma_ramps16_destroy(libgamma_gamma_ramps16_t* restrict this);
/**
* Release resources that are held by a gamma ramp strcuture that
@@ -1081,7 +1081,7 @@ void libgamma_gamma_ramps_destroy(libgamma_gamma_ramps_t* restrict this);
*
* @param this The gamma ramps.
*/
-void libgamma_gamma_ramps_free(libgamma_gamma_ramps_t* restrict this);
+void libgamma_gamma_ramps16_free(libgamma_gamma_ramps16_t* restrict this);
/**
diff --git a/src/test/test.c b/src/test/test.c
index eafe90f..8bb6183 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -275,8 +275,8 @@ int main(void)
libgamma_partition_state_t* restrict part_state = malloc(sizeof(libgamma_partition_state_t));
libgamma_crtc_state_t* restrict crtc_state = malloc(sizeof(libgamma_crtc_state_t));
libgamma_crtc_information_t info;
- libgamma_gamma_ramps_t old_ramps;
- libgamma_gamma_ramps_t ramps;
+ libgamma_gamma_ramps16_t old_ramps;
+ libgamma_gamma_ramps16_t ramps;
size_t i, n;
int r;
@@ -296,13 +296,13 @@ int main(void)
old_ramps.green_size = info.green_gamma_size;
old_ramps.blue_size = info.blue_gamma_size;
ramps = old_ramps;
- libgamma_gamma_ramps_initialise(&old_ramps);
- libgamma_gamma_ramps_initialise(&ramps);
+ libgamma_gamma_ramps16_initialise(&old_ramps);
+ libgamma_gamma_ramps16_initialise(&ramps);
- libgamma_crtc_get_gamma_ramps(crtc_state, &old_ramps);
- r = libgamma_crtc_get_gamma_ramps(crtc_state, &ramps);
+ libgamma_crtc_get_gamma_ramps16(crtc_state, &old_ramps);
+ r = libgamma_crtc_get_gamma_ramps16(crtc_state, &ramps);
if (r)
- libgamma_perror("libgamma_crtc_get_gamma_ramps", r);
+ libgamma_perror("libgamma_crtc_get_gamma_ramps16", r);
else
{
n = ramps.red_size;
@@ -331,13 +331,13 @@ int main(void)
ramps.red[i] /= 2;
printf("Dimming monitor for 1 second...\n");
- r = libgamma_crtc_set_gamma_ramps(crtc_state, ramps);
+ r = libgamma_crtc_set_gamma_ramps16(crtc_state, ramps);
if (r)
- libgamma_perror("libgamma_crtc_set_gamma_ramps", r);
+ libgamma_perror("libgamma_crtc_set_gamma_ramps16", r);
sleep(1);
- r = libgamma_crtc_set_gamma_ramps(crtc_state, old_ramps);
+ r = libgamma_crtc_set_gamma_ramps16(crtc_state, old_ramps);
if (r)
- libgamma_perror("libgamma_crtc_set_gamma_ramps", r);
+ libgamma_perror("libgamma_crtc_set_gamma_ramps16", r);
printf("Done!\n");
}
@@ -345,8 +345,8 @@ int main(void)
/* TODO Test _f gamma ramp setters. */
/* TODO Test gamma ramp getters/setters of other bit depths. */
- libgamma_gamma_ramps_destroy(&ramps);
- libgamma_gamma_ramps_destroy(&old_ramps);
+ libgamma_gamma_ramps16_destroy(&ramps);
+ libgamma_gamma_ramps16_destroy(&old_ramps);
libgamma_crtc_free(crtc_state);
libgamma_partition_free(part_state);
libgamma_site_free(site_state);