image_science 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.2.1 / 2009-08-14
+
+* 2 minor enhancements:
+
+  * Added luis' patches to make it build properly on windows.
+  * with_image now raises on missing/bad files.
+
 == 1.2.0 / 2009-06-23
 
 * 7 minor enhancements:

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -94,15 +94,22 @@ class ImageScience
     end
 
     builder.add_link_flags "-lfreeimage"
-    builder.add_link_flags "-lstdc++" # only needed on PPC for some reason. lame
+    unless RUBY_PLATFORM =~ /mswin/
+      builder.add_link_flags "-lfreeimage"
+      # TODO: detect PPC
+      builder.add_link_flags "-lstdc++" # only needed on PPC for some reason
+    else
+      builder.add_link_flags "freeimage.lib"
+    end
     builder.include '"FreeImage.h"'
 
     builder.prefix <<-"END"
-      #define GET_BITMAP(name) FIBITMAP *(name); Data_Get_Struct(self, FIBITMAP, (name)); if (!(name)) rb_raise(rb_eTypeError, "Bitmap has already been freed")
+      #define GET_BITMAP(name) Data_Get_Struct(self, FIBITMAP, (name)); if (!(name)) rb_raise(rb_eTypeError, "Bitmap has already been freed");
     END
 
     builder.prefix <<-"END"
       VALUE unload(VALUE self) {
+        FIBITMAP *bitmap;
         GET_BITMAP(bitmap);
 
         FreeImage_Unload(bitmap);
@@ -148,13 +155,14 @@ class ImageScience
     builder.c_singleton <<-"END"
       VALUE with_image(char * input) {
         FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
+        int flags;
 
         fif = FreeImage_GetFileType(input, 0);
         if (fif == FIF_UNKNOWN) fif = FreeImage_GetFIFFromFilename(input);
         if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) {
           FIBITMAP *bitmap;
           VALUE result = Qnil;
-          int flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
+          flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
           if (bitmap = FreeImage_Load(fif, input, flags)) {
             FITAG *tagValue = NULL;
             FreeImage_GetMetadata(FIMD_EXIF_MAIN, bitmap, "Orientation", &tagValue); 
@@ -212,7 +220,7 @@ class ImageScience
 
     builder.c <<-"END"
       VALUE with_crop(int l, int t, int r, int b) {
-        FIBITMAP *copy;
+        FIBITMAP *copy, *bitmap;
         VALUE result = Qnil;
         GET_BITMAP(bitmap);
 
@@ -226,6 +234,7 @@ class ImageScience
 
     builder.c <<-"END"
       int height() {
+        FIBITMAP *bitmap;
         GET_BITMAP(bitmap);
 
         return FreeImage_GetHeight(bitmap);
@@ -234,6 +243,7 @@ class ImageScience
 
     builder.c <<-"END"
       int width() {
+        FIBITMAP *bitmap;
         GET_BITMAP(bitmap);
 
         return FreeImage_GetWidth(bitmap);
@@ -242,10 +252,11 @@ class ImageScience
 
     builder.c <<-"END"
       VALUE resize(long w, long h) {
+        FIBITMAP *bitmap, *image;
         if (w <= 0) rb_raise(rb_eArgError, "Width <= 0");
         if (h <= 0) rb_raise(rb_eArgError, "Height <= 0");
         GET_BITMAP(bitmap);
-        FIBITMAP *image = FreeImage_Rescale(bitmap, w, h, FILTER_CATMULLROM);
+        image = FreeImage_Rescale(bitmap, w, h, FILTER_CATMULLROM);
         if (image) {
           copy_icc_profile(self, bitmap, image);
           return wrap_and_yield(image, self, 0);
@@ -256,11 +267,13 @@ class ImageScience
 
     builder.c <<-"END"
       VALUE save(char * output) {
+        int flags;
+        FIBITMAP *bitmap;
         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)) {
           GET_BITMAP(bitmap);
-          int flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
+          flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
           BOOL result = 0, unload = 0;
 
           if (fif == FIF_PNG) FreeImage_DestroyICCProfile(bitmap);

data/test/test_image_science.rb

@@ -48,8 +48,10 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_class_with_image_missing_with_img_extension
-    assert_nil ImageScience.with_image("nope#{@path}") do |img|
-      flunk
+    assert_raises RuntimeError do
+      assert_nil ImageScience.with_image("nope#{@path}") do |img|
+        flunk
+      end
     end
   end
 

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: image_science
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-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-----
+cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.3.3
     version: 
 description: |-
   ImageScience is a clean and happy Ruby library that generates
@@ -94,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 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

metadata.gz.sig

@@ -1,4 +0,0 @@
-#
-���
-�'��6�@�[ߺk~�V;t��7�����hG��I�q�j_�#�IH�������%���T'���0O������
-(r%��$�