Merge branch 'master' of git@github.com:/gallery/gallery3

Conflicts:
	modules/server_add/controllers/admin_server_add.php

1 files changed, 9 insertions, 29 deletions

diff --git a/modules/exif/lib/exif.php b/modules/exif/lib/exif.php
index f335dad4..bd72f237 100644
--- a/modules/exif/lib/exif.php
+++ b/modules/exif/lib/exif.php
@@ -1007,35 +1007,15 @@ if ($result['ValidJpeg'] == 1) {
 //================================================================================================
 function ConvertToFraction($v, &$n, &$d)
 {
-	$MaxTerms = 15;         // Limit to prevent infinite loop
-	$MinDivisor = 0.000001; // Limit to prevent divide by zero
-	$MaxError = 0.00000001; // How close is enough
-
-	$f = $v; // Initialize fraction being converted
-
-	$n_un = 1; // Initialize fractions with 1/0, 0/1
-	$d_un = 0;
-	$n_deux = 0;
-	$d_deux = 1;
-
-	for ($i = 0; $i<$MaxTerms; $i++)
-	{
-		$a = floor($f); // Get next term
-		$f = $f - $a; // Get new divisor
-		$n = $n_un * $a + $n_deux; // Calculate new fraction
-		$d = $d_un * $a + $d_deux;
-		$n_deux = $n_un; // Save last two fractions
-		$d_deux = $d_un;
-		$n_un = $n;
-		$d_un = $d;
-
-		if ($f < $MinDivisor) // Quit if dividing by zero
-			break;
-
-		if (abs($v - $n / $d) < $MaxError)
-			break;
-
-		$f = 1 / $f; // Take reciprocal
+	if ($v == 0) {
+		$n = 0;
+		$d = 1;
+		return;
+	}
+	for ($n=1; $n<100; $n++) {
+		$v1 = 1/$v*$n;
+		$d = round($v1, 0);
+		if (abs($d - $v1) < 0.02) return;// within tolarance
 	}
 }