image_science 1.2.1 → 1.2.2

data.tar.gz.sig

@@ -0,0 +1,3 @@
+�s�OP�/⩔C��$��	�^od7��S�F�\Tb�㰫���E�#%���pY�콞�Q���[ �{�Dv�a֜����R��f���T�r��Õ9:v�����
+��Sf;��#���~|�'�s��
+�

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.2.2 / 2012-03-13
+
+* 1 minor enhancement:
+
+  * Extended build to look for homebrew setup (hcatlin)
+
+* 2 bug fixes:
+
+  * Fixed 1.9 warnings, clang warnings, etc...
+  * Fixed compilation error when ruby's config mandates C89 style decls. (nocode)
+
 === 1.2.1 / 2009-08-14
 
 * 2 minor enhancements:

data/README.txt

@@ -13,18 +13,18 @@ For more information including build steps, see http://seattlerb.rubyforge.org/
 
 == FEATURES/PROBLEMS:
 
-* Glorious graphics manipulation magi... errr, SCIENCE! in less than 200 LoC!
+* Glorious graphics manipulation magi... errr, SCIENCE! in less than 300 LoC!
 * Supports square and proportional thumbnails, as well as arbitrary resizes.
 * Pretty much any graphics format you could want. No really.
 
 == SYNOPSYS:
 
-  ImageScience.with_image(file) do |img|
-    img.cropped_thumbnail(100) do |thumb|
+  ImageScience.with_image file do |img|
+    img.cropped_thumbnail 100 do |thumb|
       thumb.save "#{file}_cropped.png"
     end
 
-    img.thumbnail(100) do |thumb|
+    img.thumbnail 100 do |thumb|
       thumb.save "#{file}_thumb.png"
     end
   end

data/Rakefile

@@ -3,6 +3,9 @@
 require 'rubygems'
 require 'hoe'
 
+Hoe.add_include_dirs("../../RubyInline/dev/lib",
+                     "../../ZenTest/dev/lib")
+
 Hoe.plugin :seattlerb
 Hoe.plugin :inline
 

data/lib/image_science.rb

@@ -11,49 +11,46 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
-
-  def self.with_image(path) # :yields: image
-  end
+  #
+  # :singleton-method: with_image
 
   ##
-  # The top-level image loader, opens an image from the string +data+ and then yields the image.
-
-  def self.with_image_from_memory(data) # :yields: image
-  end
+  # The top-level image loader, opens an image from the string +data+
+  # and then yields the image.
+  #
+  # :singleton-method: with_image_from_memory
 
   ##
   # Crops an image to +left+, +top+, +right+, and +bottom+ and then
   # yields the new image.
-
-  def with_crop(left, top, right, bottom) # :yields: image
-  end
+  #
+  # :method: with_crop
 
   ##
   # Returns the width of the image, in pixels.
-
-  def width; end
+  #
+  # :method: width
 
   ##
   # Returns the height of the image, in pixels.
-
-  def height; end
+  #
+  # :method: height
 
   ##
   # Saves the image out to +path+. Changing the file extension will
   # convert the file type to the appropriate format.
-
-  def save(path); end
+  #
+  # :method: save
 
   ##
   # Resizes the image to +width+ and +height+ using a cubic-bspline
   # filter and yields the new image.
-
-  def resize(width, height) # :yields: image
-  end
+  #
+  # :method: resize
 
   ##
   # Creates a proportional thumbnail of the image scaled so its longest
@@ -88,9 +85,11 @@ class ImageScience
   end
 
   inline do |builder|
-    if test ?d, "/opt/local" then
-      builder.add_compile_flags "-I/opt/local/include"
-      builder.add_link_flags "-L/opt/local/lib"
+    %w[/opt/local /usr/local].each do |dir|
+      if File.directory? "#{dir}/include" then
+        builder.add_compile_flags "-I#{dir}/include"
+        builder.add_link_flags "-L#{dir}/lib"
+      end
     end
 
     builder.add_link_flags "-lfreeimage"
@@ -163,7 +162,7 @@ class ImageScience
           FIBITMAP *bitmap;
           VALUE result = Qnil;
           flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
-          if (bitmap = FreeImage_Load(fif, input, flags)) {
+          if ((bitmap = FreeImage_Load(fif, input, flags))) {
             FITAG *tagValue = NULL;
             FreeImage_GetMetadata(FIMD_EXIF_MAIN, bitmap, "Orientation", &tagValue); 
             switch (tagValue == NULL ? 0 : *((short *) FreeImage_GetTagValue(tagValue))) {
@@ -185,17 +184,24 @@ class ImageScience
           return result;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
+        return Qnil;
       }
     END
 
     builder.c_singleton <<-"END"
       VALUE with_image_from_memory(VALUE image_data) {
         FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
+        BYTE *image_data_ptr;
+        DWORD image_data_length;
+        FIMEMORY *stream;
+        FIBITMAP *bitmap = NULL;
+        VALUE result = Qnil;
+        int flags;
 
         Check_Type(image_data, T_STRING);
-        BYTE *image_data_ptr    = (BYTE*)RSTRING_PTR(image_data);
-        DWORD image_data_length = RSTRING_LEN(image_data);
-        FIMEMORY *stream = FreeImage_OpenMemory(image_data_ptr, image_data_length);
+        image_data_ptr    = (BYTE*)RSTRING_PTR(image_data);
+        image_data_length = (DWORD)RSTRING_LEN(image_data);
+        stream = FreeImage_OpenMemory(image_data_ptr, image_data_length);
 
         if (NULL == stream) {
           rb_raise(rb_eTypeError, "Unable to open image_data");
@@ -206,9 +212,7 @@ class ImageScience
           rb_raise(rb_eTypeError, "Unknown file format");
         }
 
-        FIBITMAP *bitmap = NULL;
-        VALUE result = Qnil;
-        int flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
+        flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
         bitmap = FreeImage_LoadFromMemory(fif, stream, flags);
         FreeImage_CloseMemory(stream);
         if (bitmap) {
@@ -224,7 +228,7 @@ class ImageScience
         VALUE result = Qnil;
         GET_BITMAP(bitmap);
 
-        if (copy = FreeImage_Copy(bitmap, l, t, r, b)) {
+        if ((copy = FreeImage_Copy(bitmap, l, t, r, b))) {
           copy_icc_profile(self, bitmap, copy);
           result = wrap_and_yield(copy, self, 0);
         }
@@ -251,7 +255,7 @@ class ImageScience
     END
 
     builder.c <<-"END"
-      VALUE resize(long w, long h) {
+      VALUE resize(int w, int h) {
         FIBITMAP *bitmap, *image;
         if (w <= 0) rb_raise(rb_eArgError, "Width <= 0");
         if (h <= 0) rb_raise(rb_eArgError, "Height <= 0");
@@ -272,9 +276,9 @@ class ImageScience
         FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(output);
         if (fif == FIF_UNKNOWN) fif = FIX2INT(rb_iv_get(self, "@file_type"));
         if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) {
+          BOOL result = 0, unload = 0;
           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)
@@ -287,6 +291,7 @@ class ImageScience
           return result ? Qtrue : Qfalse;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
+        return Qnil;
       }
     END
   end

metadata

@@ -1,27 +1,103 @@
 --- !ruby/object:Gem::Specification 
 name: image_science
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  hash: 27
+  prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-08-14 00:00:00 -07:00
-default_executable: 
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: RubyInline
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 9
+        version: "3.9"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 15
+        version: "2.15"
+  type: :development
+  version_requirements: *id004
 description: |-
   ImageScience is a clean and happy Ruby library that generates
   thumbnails -- and kicks the living crap out of RMagick. Oh, and it
@@ -48,7 +124,7 @@ files:
 - lib/image_science.rb
 - test/pix.png
 - test/test_image_science.rb
-has_rdoc: true
+- .gemtest
 homepage: http://seattlerb.rubyforge.org/ImageScience.html
 licenses: []
 
@@ -59,21 +135,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: ImageScience is a clean and happy Ruby library that generates thumbnails -- and kicks the living crap out of RMagick