# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1272477406 -7200
# Node ID 84d54120ed7e3ae3f8b40309767e9dad1957f200
# Parent  074326680b0924fe73d1a9a42fe1178fd3d5e96d# Parent  65f17722d5c817be507681c18018cd657d0b2a16
Merge with 65f17722d5c817be507681c18018cd657d0b2a16

diff -r 65f17722d5c8 -r 84d54120ed7e web/thdProject/apps/frontend/config/app.yml.tmpl
--- a/web/thdProject/apps/frontend/config/app.yml.tmpl	Wed Apr 28 19:49:05 2010 +0200
+++ b/web/thdProject/apps/frontend/config/app.yml.tmpl	Wed Apr 28 19:56:46 2010 +0200
@@ -1,19 +1,6 @@
 # default values
 all:
-   storage:
-      #segmentation files
-      uploads: "/Users/gautierthibault/Sites/thd/web/uploads/"
-      format: ".csv"
     
-   video:
-     root_uri: "http://thdmercurial/videos"
-     
-   image:
-     root_uri: "/Users/gautierthibault/Sites/mosatags/web/thdProject/web/images"
-     
-   poster:
-     root_uri: "http://thdmercurial/posters"
-
    film_image:
      root_uri: "http://thd.universcine.com/media/images"
    
diff -r 65f17722d5c8 -r 84d54120ed7e web/thdProject/plugins/UcImageScalerPlugin/lib/UcImageCacheManager.class.php
--- a/web/thdProject/plugins/UcImageScalerPlugin/lib/UcImageCacheManager.class.php	Wed Apr 28 19:49:05 2010 +0200
+++ b/web/thdProject/plugins/UcImageScalerPlugin/lib/UcImageCacheManager.class.php	Wed Apr 28 19:56:46 2010 +0200
@@ -44,7 +44,8 @@
 
     //not already cached
     if(!$this->cache->has($imageKey)) {
-      $thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfImageMagickAdapter');
+      //$thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfImageMagickAdapter');
+	  $thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfGDAdapter');
 
       try {
         $thumbnail->loadFile($imageUrl);