HotCocoa Graphics optimizations provided by Alan Skipp

git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@3081 23306eb0-4c56-4727-a40e-e92c0eb68959
MacRuby · Dec 8, 2009 · bb3294e · bb3294e
1 parent 775b7d8
commit bb3294e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/hotcocoa/graphics/image.rb b/lib/hotcocoa/graphics/image.rb
@@ -58,11 +58,10 @@ def initialize(img, verbose=false)
         @path = img
         File.exists?(@path) or raise "ERROR: file not found: #{@path}"
 
-        nsimage = NSImage.alloc.initWithContentsOfFile(img)
-        nsdata = nsimage.TIFFRepresentation
-        @nsbitmapimage = NSBitmapImageRep.imageRepWithData(nsdata)
-        # cgimagesource = CGImageSourceCreateWithData(nsdata) # argh, doesn't work
-        @ciimage = CIImage.alloc.initWithBitmapImageRep(@nsbitmapimage)
+        image_source = CGImageSourceCreateWithURL(NSURL.fileURLWithPath(@path), nil)
+        @cgimage = CGImageSourceCreateImageAtIndex(image_source, 0, nil)
+        @ciimage = CIImage.imageWithCGImage(@cgimage)
+
       when Canvas
         puts "Image.new with canvas" if @verbose
         @path = 'canvas'
@@ -80,7 +79,7 @@ def initialize(img, verbose=false)
 
     # reload the bitmap image
     def reset
-      @ciimage = CIImage.alloc.initWithBitmapImageRep(@nsbitmapimage)
+      @ciimage = CIImage.imageWithCGImage(@cgimage)
       self
     end