rmagick 5.4.2 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb1a551d7173e48abee9a0fab4dcc0b40c1c9a38861ebeb0c654f106149ee8b
-  data.tar.gz: '084ad765347cab4fd541596709a6543ad6652fc1e80fe6fb8b192449bda40650'
+  metadata.gz: 6fd768daa5bf84d7e835a4c300d57f6826b3fd86820dd3048a12d73db62ec89f
+  data.tar.gz: b7afe50d7396365282e6d5e8ff7b8a6c2b0e91e7f1e2d9562d1078dd26bda7a4
 SHA512:
-  metadata.gz: aa8f0a1f018ca12d44907f42beb2a8c448f0961a5ebe9ea0a97d8032248868a5ae858a2e6c2ab1ad5cc75906f51fcf697bfecce021b33e4a115914a27499907b
-  data.tar.gz: d0d0b125221d96fcc0c67c584a7d9d69abb5dfcba279e2254347f0f65470d7fe71fa1d483764f9a1aca4862c59e5953321b8eae6f2aa477dd2e4164b19702ab1
+  metadata.gz: 23b6376b8c659276107e35c4e58428bc68a4cd8d2d24830ee27c99a83dea0349516af72bf8746a9064f115d35ae3e2f8affa376c6b6ec77d8b7a89aa7ddede8c
+  data.tar.gz: 7633f97e950e07f2381f25d1a181b427408fa8e46790b0506c31d83d029f58f5098a073446d659d82a05988c20848f60a37fbfe5759340a8613da87bdbc53cae

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 5.4.4
+
+Bug Fixes
+
+- Fix installation error again in some environment at creatint Makefile (#1465)
+- Fix Pixel#<=> which should accept other class instance (#1463)
+
+## RMagick 5.4.3
+
+Bug Fixes
+
+- Fix installation error in some environment by using x flag to use C++ compiler in order to create Makefile (#1460)
+
 ## RMagick 5.4.2
 
 Improvements

data/ext/RMagick/extconf.rb

@@ -5,7 +5,7 @@ require 'mkmf'
 require 'pkg-config'
 
 module MakeMakefile
-  # Use the C++ compiler to retrieve the information needed to create a Makefile.
+  # Use the C++ compiler to retrieve the information needed to create a Makefile for mswin environment.
   remove_const(:CONFTEST_C)
   CONFTEST_C = "#{CONFTEST}.cpp"
 end
@@ -109,7 +109,8 @@ module RMagick
 
         # Save flags
         $CPPFLAGS   += " #{ENV['CPPFLAGS']} " + PKGConfig.cflags($magick_package).chomp
-        $LOCAL_LIBS += " #{ENV['LIBS']} "     + PKGConfig.libs($magick_package).chomp
+        $CPPFLAGS   += ' -x c++ -std=c++11 -Wno-register'
+        $LOCAL_LIBS += " #{ENV['LIBS']} " + PKGConfig.libs($magick_package).chomp
         $LDFLAGS    += " #{ldflags} #{rpath}"
 
         unless try_link("int main() { }")
@@ -117,19 +118,16 @@ module RMagick
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
 
-        $CPPFLAGS += ' -std=c++11 -Wno-register'
-
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
 
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
 
         dir_paths = search_paths_for_library_for_windows
         $CPPFLAGS += %( -I"#{dir_paths[:include]}")
+        $CPPFLAGS += ' -x c++ -std=c++11 -Wno-register'
         $LDFLAGS += %( -L"#{dir_paths[:lib]}")
         $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
-        $CPPFLAGS += ' -std=c++11 -Wno-register'
-
         have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
 
       else # mswin

data/ext/RMagick/rmimage.cpp

@@ -10435,7 +10435,7 @@ Image_orientation_eq(VALUE self, VALUE orientation)
 /**
  * The page attribute getter.
  *
- * @return [Magick::Rectang] the page rectangle
+ * @return [Magick::Rectangle] the page rectangle
  */
 VALUE
 Image_page(VALUE self)
@@ -10448,8 +10448,8 @@ Image_page(VALUE self)
 /**
  * The page attribute setter.
  *
- * @param rect [Magick::Rectang] the page rectangle
- * @return [Magick::Rectang] the given value
+ * @param rect [Magick::Rectangle] the page rectangle
+ * @return [Magick::Rectangle] the given value
  */
 VALUE
 Image_page_eq(VALUE self, VALUE rect)

data/ext/RMagick/rmpixel.cpp

@@ -596,7 +596,7 @@ Pixel_eql_q(VALUE self, VALUE other)
  *
  * @overload fcmp(other, fuzz = 0.0, colorspace = Magick::RGBColorspace)
  *   @param other [Magick::Pixel] The pixel to which the receiver is compared
- *   @param fuzz [Float] The amount of fuzz to allow before the colors are considered to be different
+ *   @param fuzz [Numeric] The amount of fuzz to allow before the colors are considered to be different
  *   @param colorspace [Magick::ColorspaceType] The colorspace
  *   @return [Boolean] true if equal, otherwise false
  */
@@ -711,7 +711,7 @@ Pixel_from_color(VALUE klass ATTRIBUTE_UNUSED, VALUE name)
  *   @param hue [Numeric, String] A value in the range.
  *   @param saturation [Numeric, String] A value in the range.
  *   @param lightness [Numeric, String] A value in the range.
- *   @param alpha [Numeric] The alpha value.
+ *   @param alpha [Numeric, String] The alpha value.
  *   @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
@@ -1069,6 +1069,10 @@ Pixel_spaceship(VALUE self, VALUE other)
 {
     Pixel *self_pixel, *other_pixel;
 
+    if (CLASS_OF(self) != CLASS_OF(other)) {
+        return Qnil;
+    }
+
     TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
     TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
 
@@ -1096,10 +1100,8 @@ Pixel_spaceship(VALUE self, VALUE other)
     }
 #endif
 
-    // Values are equal, check class.
-
-    return rb_funcall(CLASS_OF(self), rb_intern("<=>"), 1, CLASS_OF(other));
-
+    // Values are equal.
+    return INT2NUM(0);
 }
 
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '5.4.2'
+  VERSION = '5.4.4'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.4
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config