Commit 5d737fd4

@@ -23,12 +23,12 @@ class PhotoUploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   version :large do 
-    process :convert => 'png'
+    #process :convert => 'png'
     process :resize_to_fit => [570, 630]
     process :watermark
   end
   version :thumb, :from_version => :large do
-    process :convert => 'png'
+    #process :convert => 'png'
     process :resize_to_fill => [260, 180]
   end
 
@@ -56,11 +56,11 @@ class PhotoUploader < CarrierWave::Uploader::Base
 
   # Override the filename of the uploaded files:
   # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  def filename
-    if original_filename 
-      super.chomp(File.extname(super)) + '.png'
-    end
-  end
+  #def filename
+    #if original_filename 
+      #super.chomp(File.extname(super)) + '.png'
+    #end
+  #end
   def default_url
    "/assets/fallback/" + [version_name, "default.png"].compact.join('_') 
   end