smartimage 0.0.3-java → 0.0.4-java

data/CHANGES

@@ -1,3 +1,11 @@
+0.0.4:
+
+* Fixed bug in processing alpha channel of JRuby canvas objects when saving
+  .jpgs, causing color channel corruption.
+
+* Fixed bug in SmartImage.thumbnail_file where images are always saved as .pngs
+  regardless of the specified file extension.
+
 0.0.3:
 
 * JRuby 1.5.1 compatibility fixes

data/Rakefile

@@ -54,25 +54,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-namespace :java do
-  desc 'Munge the Jeweler gemspec into a JRuby compatible one'
-  task :gemspec => 'rake:gemspec' do
-    gemspec = File.read('smartimage.gemspec')
-    
-    # Remove the last end statement
-    gemspec.sub!(/end\s*\Z/m, '')
-    
-    # Add the Java platform requirement
-    gemspec << "  s.platform = %q{java}\n"
-    
-    # Readd the end statement
-    gemspec << "end\n"
-    
-    # Remove RMagic dependencies
-    gemspec = gemspec.split("\n").reject { |line| line["<rmagick>"] }.join("\n")
-    
-    # Write the Java gemspec
-    File.open("smartimage-java.gemspec", "w") { |file| file << gemspec }
-  end
-end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/smart_image.rb

@@ -76,7 +76,7 @@ class SmartImage
         :format => File.extname(output_path).sub(/^\./, '')
       }.merge(options)
       
-      data = SmartImage.thumbnail File.read(input_path), options
+      data = SmartImage.thumbnail File.read(input_path), opts
       File.open(output_path, 'w') { |file| file << data }
     end
     
@@ -179,7 +179,10 @@ class SmartImage
   # just there to annoy you and make you wish it had more options.
   def encode(format, options = {})
     # Sorry .jpeg lovers, I'm one of you too but the standard is jpg
-    format = :jpg if format.to_s == 'jpeg'
+    format = 'jpg' if format.to_s == 'jpeg'
+    format = format.to_s
+    
+    raise ArgumentError, "invalid format: #{format}" unless %w(jpg png gif).include?(format)
     
     @canvas.encode format, options
   end

data/lib/smart_image/java_canvas.rb

@@ -10,6 +10,7 @@ class SmartImage
     java_import java.io.ByteArrayOutputStream
     
     def initialize(width, height)
+      @width, @height = width, height
       @canvas = BufferedImage.new width, height, BufferedImage::TYPE_INT_ARGB
     end
     
@@ -64,8 +65,19 @@ class SmartImage
     
     # Encode the image to the given format
     def encode(format, options = {})
+      case format
+      when 'jpg'
+        # If we're trying to save an JPEG, we need to convert it to RGB
+        canvas = BufferedImage.new @width, @height, BufferedImage::TYPE_INT_RGB
+        
+        graphics = canvas.graphics
+        graphics.draw_image @canvas, 0, 0, @width, @height, nil
+      else
+        canvas = @canvas
+      end
+      
       output_stream = ByteArrayOutputStream.new
-      ImageIO.write(@canvas, format.to_s, output_stream)
+      ImageIO.write(canvas, format, output_stream)
       String.from_java_bytes output_stream.to_byte_array
     end
   end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartimage
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 3
-  version: 0.0.3
+  version: 0.0.4
 platform: java
 authors: 
   - Tony Arcieri
@@ -14,37 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -06:00
+date: 2010-07-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: imagesize
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 1
             version: 0.1.1
-    type: :runtime
-    version_requirements: *id001
+      version: 
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 9
             version: 1.2.9
-    type: :development
-    version_requirements: *id002
+      version: 
 description: "    SmartImage provides a cross-platform solution for image compositing that works on both MRI and JRuby.\n    If using RMagick feels like swatting a fly with a nucler missile, and ImageScience just doesn't get \n    you there, SmartImage is hopefully at that sweet spot in the middle\n"
 email: tony@medioh.com
 executables: []
@@ -87,20 +74,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: It's like a Swiss Army Knife for images, but one of those tiny ones you can keep on your keychain