summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2015-04-07 08:18:13 -0700
committerAaron Plattner <aplattner@nvidia.com>2015-04-07 08:18:13 -0700
commitc0d94df83797afc9be327ee3835ac4e7306a3ae8 (patch)
tree5d69553d9307d017439f3a2b74b7080dc395322a
parentc15e4392b924c29d4388b925191dce9e3a46c98a (diff)
346.59346.59
-rw-r--r--doc/version.mk2
-rw-r--r--samples/version.mk2
-rw-r--r--src/gtk+-2.x/ctkframelock.c6
-rw-r--r--src/libXNVCtrl/version.mk2
-rw-r--r--src/version.h2
-rw-r--r--src/version.mk2
-rw-r--r--version.mk2
7 files changed, 9 insertions, 9 deletions
diff --git a/doc/version.mk b/doc/version.mk
index d622b1f..d68edad 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 346.47
+NVIDIA_VERSION = 346.59
diff --git a/samples/version.mk b/samples/version.mk
index d622b1f..d68edad 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 346.47
+NVIDIA_VERSION = 346.59
diff --git a/src/gtk+-2.x/ctkframelock.c b/src/gtk+-2.x/ctkframelock.c
index 63acf72..3704ea1 100644
--- a/src/gtk+-2.x/ctkframelock.c
+++ b/src/gtk+-2.x/ctkframelock.c
@@ -1214,7 +1214,7 @@ static void list_entry_update_gpu_controls(CtkFramelock *ctk_framelock,
static gboolean framelock_refresh_rates_compatible(int server, int client)
{
- int range;
+ double range;
/* client can be 0, e.g. if querying NV_CTRL_REFRESH_RATE{,_3} fails,
* or if the display device is disabled. */
@@ -1222,11 +1222,11 @@ static gboolean framelock_refresh_rates_compatible(int server, int client)
return FALSE;
}
- range = ABS(((int64_t)(server - client) * 1000000) / client);
+ range = ABS(((double)(server - client) * 1000000.0) / client);
/* Framelock can be achieved if the range between refresh rates is less
* than 50 ppm */
- return range <= 50;
+ return range <= 50.0;
}
/** list_entry_update_display_controls() *****************************
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index d622b1f..d68edad 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 346.47
+NVIDIA_VERSION = 346.59
diff --git a/src/version.h b/src/version.h
index 0fbccd5..d2c426b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "346.47"
+#define NVIDIA_VERSION "346.59"
diff --git a/src/version.mk b/src/version.mk
index d622b1f..d68edad 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 346.47
+NVIDIA_VERSION = 346.59
diff --git a/version.mk b/version.mk
index d622b1f..d68edad 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 346.47
+NVIDIA_VERSION = 346.59