rmagick 1.12.0 → 1.13.0

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.120 2006/06/02 23:26:53 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.124 2006/06/26 23:32:37 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -710,7 +710,7 @@ Init_RMagick(void)
     DCL_ATTR_READER(Image, number_colors)
     DCL_ATTR_ACCESSOR(Image, offset)
     DCL_ATTR_WRITER(Image, opacity)
-    DCL_ATTR_READER(Image, orientation)
+    DCL_ATTR_ACCESSOR(Image, orientation)
     DCL_ATTR_ACCESSOR(Image, page)
 #if defined(HAVE_IMAGE_QUALITY)
     DCL_ATTR_READER(Image, quality)
@@ -729,12 +729,16 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Image, x_resolution)
     DCL_ATTR_ACCESSOR(Image, y_resolution)
 
+    rb_define_method(Class_Image, "adaptive_sharpen", Image_adaptive_sharpen, -1);
+    rb_define_method(Class_Image, "adaptive_sharpen_channel", Image_adaptive_sharpen_channel, -1);
     rb_define_method(Class_Image, "adaptive_threshold", Image_adaptive_threshold, -1);
     rb_define_method(Class_Image, "add_noise", Image_add_noise, 1);
     rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "affine_transform", Image_affine_transform, 1);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
+    rb_define_method(Class_Image, "auto_orient", Image_auto_orient, 0);
+    rb_define_method(Class_Image, "auto_orient!", Image_auto_orient_bang, 0);
     rb_define_method(Class_Image, "properties", Image_properties, 0);
     rb_define_method(Class_Image, "bilevel_channel", Image_bilevel_channel, -1);
     rb_define_method(Class_Image, "black_threshold", Image_black_threshold, -1);
@@ -763,6 +767,8 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "composite", Image_composite, -1);
     rb_define_method(Class_Image, "composite!", Image_composite_bang, -1);
     rb_define_method(Class_Image, "composite_affine", Image_composite_affine, 2);
+    rb_define_method(Class_Image, "composite_channel", Image_composite_channel, -1);
+    rb_define_method(Class_Image, "composite_channel!", Image_composite_channel_bang, -1);
     rb_define_method(Class_Image, "compress_colormap!", Image_compress_colormap_bang, 0);
     rb_define_method(Class_Image, "contrast", Image_contrast, -1);
     rb_define_method(Class_Image, "contrast_stretch_channel", Image_contrast_stretch_channel, -1);
@@ -833,6 +839,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "quantize", Image_quantize, -1);
     rb_define_method(Class_Image, "quantum_operator", Image_quantum_operator, -1);
     rb_define_method(Class_Image, "radial_blur", Image_radial_blur, 1);
+    rb_define_method(Class_Image, "radial_blur_channel", Image_radial_blur_channel, -1);
     rb_define_method(Class_Image, "raise", Image_raise, -1);
     rb_define_method(Class_Image, "random_channel_threshold", Image_random_channel_threshold, 2);
     rb_define_method(Class_Image, "random_threshold_channel", Image_random_threshold_channel, -1);
@@ -876,6 +883,10 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "to_color", Image_to_color, 1);
     rb_define_method(Class_Image, "to_blob", Image_to_blob, 0);
     rb_define_method(Class_Image, "transparent", Image_transparent, -1);
+    rb_define_method(Class_Image, "transpose", Image_transpose, 0);
+    rb_define_method(Class_Image, "transpose!", Image_transpose_bang, 0);
+    rb_define_method(Class_Image, "transverse", Image_transverse, 0);
+    rb_define_method(Class_Image, "transverse!", Image_transverse_bang, 0);
     rb_define_method(Class_Image, "trim", Image_trim, 0);
     rb_define_method(Class_Image, "trim!", Image_trim_bang, 0);
     rb_define_method(Class_Image, "unsharp_mask", Image_unsharp_mask, -1);
@@ -995,11 +1006,13 @@ Init_RMagick(void)
     // Define the instance methods
     rb_define_method(Class_Pixel, "<=>", Pixel_spaceship, 1);
     rb_define_method(Class_Pixel, "===", Pixel_case_eq, 1);
+    rb_define_method(Class_Pixel, "eql?", Pixel_eql_q, 1);
     rb_define_method(Class_Pixel, "initialize", Pixel_initialize, -1);
     rb_define_method(Class_Pixel, "initialize_copy", Pixel_init_copy, 1);
     rb_define_method(Class_Pixel, "clone", Pixel_clone, 0);
     rb_define_method(Class_Pixel, "dup", Pixel_dup, 0);
     rb_define_method(Class_Pixel, "fcmp", Pixel_fcmp, -1);
+    rb_define_method(Class_Pixel, "hash", Pixel_hash, 0);
     rb_define_method(Class_Pixel, "intensity", Pixel_intensity, 0);
     rb_define_method(Class_Pixel, "to_color", Pixel_to_color, -1);
     rb_define_method(Class_Pixel, "to_HSL", Pixel_to_HSL, 0);
@@ -1786,7 +1799,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-        "This is %s ($Date: 2006/06/02 23:26:53 $) Copyright (C) 2006 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2006/06/26 23:32:37 $) Copyright (C) 2006 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.76 2006/05/27 21:05:59 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.78 2006/06/28 23:07:55 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -477,7 +477,7 @@ Pixel_from_color(VALUE class, VALUE name)
 {
     PixelPacket pp;
     ExceptionInfo exception;
-    boolean okay;
+    MagickBooleanType okay;
 
     class = class;      // defeat "never referenced" message from icc
 
@@ -611,6 +611,16 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     return Pixel_from_PixelPacket(&rgb);
 }
 
+/*
+    Method:     Pixel#eql?
+    Purpose:    For use with Hash
+*/
+VALUE
+Pixel_eql_q(VALUE self, VALUE other)
+{
+    return NUM2INT(Pixel_spaceship(self, other)) == 0 ? Qtrue : Qfalse;
+}
+
 /*
     Method:  Pixel#fcmp(other[, fuzz[, colorspace]])
     Purpose: Compare pixel values for equality
@@ -679,6 +689,30 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     return equal ? Qtrue : Qfalse;
 }
 
+
+/*
+    Method:     Pixel#hash
+    Notes:      INT2FIX left-shifts 1 bit. Sacrifice 1 bit
+                from the opacity attribute to the FIXNUM_FLAG.
+*/
+VALUE
+Pixel_hash(VALUE self)
+{
+    Pixel *pixel;
+    unsigned int hash;
+
+    Data_Get_Struct(self, Pixel, pixel);
+
+    hash  = ScaleQuantumToChar(pixel->red)   << 24;
+    hash += ScaleQuantumToChar(pixel->green) << 16;
+    hash += ScaleQuantumToChar(pixel->blue)  << 8;
+    hash += ScaleQuantumToChar(pixel->opacity);
+    hash >>= 1;
+
+    return INT2FIX(hash);
+
+}
+
 /*
     Method:  Pixel#intensity
     Purpose: Return the "intensity" of a pixel
@@ -1028,7 +1062,7 @@ PixelPacket_to_Color_Name_Info(Info *info, PixelPacket *color)
 static void
 Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
 {
-    boolean okay;
+    MagickBooleanType okay;
     char *name;
     ExceptionInfo exception;
 

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.42 2006/06/03 22:56:40 rmagick Exp $
+# $Id: RMagick.rb,v 1.43 2006/06/20 23:18:22 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2006 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -712,9 +712,14 @@ class Image
 
     # (Thanks to Al Evans for the suggestion.)
     def level(black_point=0.0, white_point=nil, gamma=nil)
+        black_point = Float(black_point)
+
         white_point ||= Magick::MaxRGB - black_point
+        white_point = Float(white_point)
+
         gamma_arg = gamma
         gamma ||= 1.0
+        gamma = Float(gamma)
 
         if gamma.abs > 10.0 || white_point.abs <= 10.0 || white_point.abs < gamma.abs
             gamma, white_point = white_point, gamma

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "1.12.0"
+  s.version = "1.13.0"
   s.date = Date.today.to_s
   s.summary = %q{RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.}
   s.description =<<DESCRIPTION
@@ -14,7 +14,7 @@ DESCRIPTION
   s.files = Dir.glob('**/*')
   s.require_paths = %w{lib .}
   s.rubyforge_project = %q{rmagick}
-  s.extensions = %w{gem_config.rb}
+  s.extensions = %w{gem_extconf.rb}
   s.has_rdoc = false
   s.required_ruby_version = '>= 1.6.7'
   s.requirements << 'ImageMagick 6.0.0 or later, or GraphicsMagick 1.0.0 or later'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.99.1
 specification_version: 1
 name: rmagick
 version: !ruby/object:Gem::Version 
-  version: 1.12.0
-date: 2006-06-03 00:00:00 -04:00
+  version: 1.13.0
+date: 2006-06-28 00:00:00 -04:00
 summary: RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.
 require_paths: 
 - lib
@@ -26,6 +26,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Tim Hunter
 files: 
@@ -36,7 +37,7 @@ files:
 - README-Mac-OSX.txt
 - README.txt
 - configure.ac
-- gem_config.rb
+- gem_extconf.rb
 - metaconfig.in
 - post-clean.rb
 - post-install.rb
@@ -248,6 +249,8 @@ files:
 - doc/ex/to_blob.rb
 - doc/ex/translate.rb
 - doc/ex/transparent.rb
+- doc/ex/transpose.rb
+- doc/ex/transverse.rb
 - doc/ex/tref01.rb
 - doc/ex/triangle01.rb
 - doc/ex/trim.rb
@@ -382,7 +385,7 @@ extra_rdoc_files: []
 executables: []
 
 extensions: 
-- gem_config.rb
+- gem_extconf.rb
 requirements: 
 - ImageMagick 6.0.0 or later, or GraphicsMagick 1.0.0 or later
 dependencies: []