don't rotate several times derivatives

rvelices · rvelices · commit f318fe042e32 · 2012-04-02T04:00:15.000Z
git-svn-id: http://piwigo.org/svn/trunk@13848 68402e56-0260-453c-a942-63ccdbb3a9ee
diff --git a/i.php b/i.php
@@ -321,6 +321,7 @@ function try_switch_source(DerivativeParams $params, $original_mtime)
     $params->sharpen = min(1, $params->sharpen);
     $page['src_path'] = $candidate_path;
     $page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH));
+    $page['rotation_angle'] = 0;
   }
 }
 
@@ -509,9 +510,11 @@ class json_response
 $changes = 0;
 
 // rotate
-if (0 != $page['rotation_angle'])
+if (0 != (int)$page['rotation_angle'])
 {
   $image->rotate($page['rotation_angle']);
+  $changes++;
+  $timing['rotate'] = time_step($step);
 }
 
 // Crop & scale

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@ function try_switch_source(DerivativeParams $params, $original_mtime)`
`321`	`321`	`$params->sharpen = min(1, $params->sharpen);`
`322`	`322`	`$page['src_path'] = $candidate_path;`
`323`	`323`	`$page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH));`
	`324`	`+ $page['rotation_angle'] = 0;`
`324`	`325`	`}`
`325`	`326`	`}`
`326`	`327`
`@@ -509,9 +510,11 @@ class json_response`
`509`	`510`	`$changes = 0;`
`510`	`511`
`511`	`512`	`// rotate`
`512`		`-if (0 != $page['rotation_angle'])`
	`513`	`+if (0 != (int)$page['rotation_angle'])`
`513`	`514`	`{`
`514`	`515`	`$image->rotate($page['rotation_angle']);`
	`516`	`+ $changes++;`
	`517`	`+ $timing['rotate'] = time_step($step);`
`515`	`518`	`}`
`516`	`519`
`517`	`520`	`// Crop & scale`