g1nn13-image_science 1.2.7 → 1.2.8

data.tar.gz.sig

@@ -0,0 +1,2 @@
+P엸�����=x�+%~�
����V�)�7�+�{E3`
��b����ٟh�ȸ�8�{�>fo��
+F��Z=yN���

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.8 / 2010-05-27
+
+* re-added C code for buffer method. This was lost in the 1.2.6 merge.
+* added a clarifying comment to the docs for buffer() 
+ 
 === 1.2.7 / 2010-05-26
 
 * removed redundant method cropped_to_fit

data/lib/image_science.rb

@@ -13,7 +13,7 @@ require 'inline'
 # Based on ImageScience 1.2.1
 
 class ImageScience
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -53,8 +53,9 @@ class ImageScience
   ##
   # Returns the image in a buffer (String). Changing the file
   # extension converts the file type to the appropriate format.
-
-  def buffer(extension) # :yields: image
+  # Note: *returns*! Does not yield!
+  
+  def buffer(extension) # :returns: string
   end
 
   ##
@@ -395,5 +396,50 @@ return result ? Qtrue : Qfalse;
 rb_raise(rb_eTypeError, "Unknown file format");
 }
 END
+
+    builder.c <<-"END"
+      VALUE buffer(char * extension) {
+        VALUE str;
+        int flags;
+        FIBITMAP *bitmap;
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(extension);
+        FIMEMORY *mem = NULL;
+        long file_size;
+        BYTE *mem_buffer = NULL; 
+        DWORD size_in_bytes = 0; 
+
+        if (fif == FIF_UNKNOWN) fif = FIX2INT(rb_iv_get(self, "@file_type"));
+        if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) {
+          GET_BITMAP(bitmap);
+          flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
+          BOOL result = 0, unload = 0;
+
+          if (fif == FIF_PNG) FreeImage_DestroyICCProfile(bitmap);
+          if (fif == FIF_JPEG && FreeImage_GetBPP(bitmap) != 24)
+            bitmap = FreeImage_ConvertTo24Bits(bitmap), unload = 1; // sue me
+
+          mem = FreeImage_OpenMemory(0,0);
+          result = FreeImage_SaveToMemory(fif, bitmap, mem, flags);
+
+          // get the buffer from the memory stream 
+          FreeImage_AcquireMemory(mem, &mem_buffer, &size_in_bytes);
+
+          // convert to ruby string
+          str = rb_str_new(mem_buffer, size_in_bytes);
+
+          // clean up
+          if (unload) FreeImage_Unload(bitmap);
+          FreeImage_CloseMemory(mem); 
+
+          if (result) {
+            return str;
+          } else {
+            return Qfalse;
+          }
+        }
+        rb_raise(rb_eTypeError, "Unknown file format");
+      }
+    END
+
   end
 end

data/test/test_image_science.rb

@@ -114,23 +114,17 @@ class TestImageScience < MiniTest::Unit::TestCase
   def test_buffer_return
     ImageScience.with_image @pix do |img|
       img.resize(25, 25) do |thumb|
-#        assert thumb.buffer('.jpg')
+        buffer = thumb.buffer('.jpg')
+        assert buffer
+        assert buffer.length > 0
         thumb.buffer('.jpg') do |buffer|
           assert buffer
+          assert buffer.length > 0
         end
       end
     end
   end
 
-  def test_buffer_yield
-    ImageScience.with_image @pix do |img|
-      img.resize(25, 25) do |thumb|
-        thumb.buffer('.jpg') do |buffer|
-          assert buffer
-        end
-      end
-    end
-  end
 
   def test_resize_floats
     ImageScience.with_image @pix do |img|

metadata

@@ -1,87 +1,141 @@
 --- !ruby/object:Gem::Specification 
 name: g1nn13-image_science
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - jim nist
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQwwCgYDVQQDDANqaW0x
+  HDAaBgoJkiaJk/IsZAEZFgxob3RlbGljb3B0ZXIxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTAwNTI2MTYwNTM5WhcNMTEwNTI2MTYwNTM5WjBBMQwwCgYDVQQDDANq
+  aW0xHDAaBgoJkiaJk/IsZAEZFgxob3RlbGljb3B0ZXIxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzbudw4TyxDTEj
+  /UMsEt2LFWmDiEKmyKHnHiPdjINn/wY8yYw1oujRj2c2iXlaon68u8G+1qacfyd0
+  gpHPFQfqBFKLDtPgPffzAkY8fvW4MgjRYFcymdpiVGpHCoTgvhO9Efsrd/d8Ja4n
+  oeEPNHdXr/bHwLhgIAup6JYQAZSL1DY77co3rbvY1xqovbc6tg/M7cbXPp1lmONS
+  XwIHPWjsl3mL1IWEQPt2dmPy6ZLYliKowdGlDUblupXuVlO9cS67yf3MlJp874mY
+  yH1qAwSK/Toe2L39TTi/Hyx6HMFECTmkLUT/4X2z6zWUlK0e5Hr8ViBCzh2BTOyO
+  jojoYo7tAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQ1LMdE7DCtf+7x6tJAqGRMKMtVXDANBgkqhkiG9w0BAQUFAAOCAQEAIu7ygDoV
+  g5wdi3wWR//1yK86vQe36luyolo3GL+Z0FmIIA+tdAPZtMAlnFasOSfLVDdkxb3O
+  J2MLyH5KHY5asc27J+Y/zUofGWj5JgQZIg+gAGcDuq94kr4NXgFTL4khE3zhI4uH
+  65+zkHrnetmZPilpTbFjzvM1SfuzrU9t+ugEu7R1vmAQdhdcgSwXr0MYPy5oZWgQ
+  eayeSBRjd6tzceXRmaZYWDH2wra509l63UgJw6dsNgWzQH1XQ1XzqJXX/J8FRgDI
+  n3ugwImcS/YB+ZQ3TQ3uKX8E5Ikos7YH0Pc/WRQnMzcjBmNtx7GsV9MC9Qx/i+YC
+  UHHftgnvI+YPGw==
+  -----END CERTIFICATE-----
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-05-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe-doofus
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe-git
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe-telicopter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-    version: 
+  type: :development
+  version_requirements: *id007
 description: |-
   g1nn13 fork changes:
   
@@ -138,18 +192,20 @@ 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: g1nn13-image_science
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "g1nn13 fork changes:  * added buffer() method to get image buffer for writing (to Amazon S3) * added fit_within() method to resize an image to fit within a specified height and width without changing the image's aspect ratio * added resize_with_crop() to resize and crop images where the target aspect ratio differs from the original aspect ratio"