rmagick 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b8378b6521fc857bfee81cb0b0d234cbacd0ea753d2f9be41180f1d4f833086
-  data.tar.gz: 6492cec6f6802500827e3e0d3b0c2c30b5ab7c000b3c4da68cf5af5dd3b856c1
+  metadata.gz: '08ddd337d97e120559c7795dd051433b1453f7c420777083bf0ba29c094659b2'
+  data.tar.gz: 06e68a270014d1a93bc4873723e82f2a83144086d33c3329ff583ea357694af4
 SHA512:
-  metadata.gz: 70fdb4d672961ba027ec56396813d81aa7101e32d3d0b73a42e28e12b779777e27a63e061d2fdcb82ee5ada9ceede1d3cf1f4124b51a62962e6c1eef656a3f66
-  data.tar.gz: b436f377627611cab9ca86f0b59e2fc8a9a9e8cbd3071fa06036ac841fe136717430851f2043aeaf31175835afab285c5dd2cd3efd5f8de51a8f58cdb38bb595
+  metadata.gz: 8b21f2dacdd58215e7fdfe7cce5c057280c8450d77fdab2b5e6bf48b2d5ba4995309b54054db4e06537ea6bc496b9e4126a2fe2462704caeaeec3be520ce94f5
+  data.tar.gz: 46e1f9816246476793cdf5f71c33abb794212a0d1935dcf81ec6a83aeb1a3668a6248cf1d7d8ad8993a758c3e129835f2cd8a4f5f5d2c0a695328a271869db29

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.0.2
+
+Bug Fixes
+
+* Fix missing error check in KernelInfo#clone (#1794)
+* Fix memory leak in Image#gamma_correct (#1793)
+* Fix memory leak in Image#{color_profile=, iptc_profile=} when out of memory (#1792)
+* Fix memory leaks if level operations fail in Image#{level_colors, levelize_channel} (#1791)
+* Clean up ImageMagick resources on exit to fix ruby_memcheck false leaks (#1790)
+
+## RMagick 7.0.1
+
+Bug Fixes
+
+* Image_gray_q changes the colour space of the image, instead of returning whether it's grayscale (#1788)
+* Check for errors from ParseGeometry() (#1786)
+* Fail explicitly when trying to install on JRuby (#1784)
+
 ## RMagick 7.0.0
 
 Breaking Changes

data/ext/RMagick/extconf.rb

@@ -42,6 +42,7 @@ module RMagick
     def initialize
       @stdout = $stdout.dup
 
+      exit_failure("JRuby is not supported.\nSee https://github.com/jruby/jruby/wiki/C-Extension-Alternatives") if RUBY_ENGINE == 'jruby'
       exit_failure("No longer support MSWIN environment.") if RUBY_PLATFORM.include?('mswin')
 
       setup_pkg_config_path
@@ -283,7 +284,6 @@ module RMagick
         _aligned_msize
       ]
       imagemagick_api = [
-        'SetImageGray', # 6.9.1-10
         'SetMagickAlignedMemoryMethods' # 7.0.9-0
       ]
 

data/ext/RMagick/rmimage.cpp

@@ -2930,6 +2930,7 @@ set_profile(VALUE self, const char *name, VALUE profile)
     info = CloneImageInfo(NULL);
     if (!info)
     {
+        DestroyExceptionInfo(exception);
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 
@@ -7646,7 +7647,7 @@ Image_gamma_correct(int argc, VALUE *argv, VALUE self)
     }
 
 #if defined(IMAGEMAGICK_7)
-    CHECK_EXCEPTION();
+    rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     rm_check_image_exception(new_image, DestroyOnError);
@@ -7929,6 +7930,13 @@ has_image_attribute(VALUE self, MagickBooleanType (attr_test)(const Image *))
 }
 #endif
 
+static MagickBooleanType
+Image_is_gray_colorspace_type(const Image *image, ExceptionInfo *exception)
+{
+    ColorspaceType colorspace = GetImageColorspaceType(image, exception);
+    return (colorspace == GRAYColorspace || colorspace == LinearGRAYColorspace) ? MagickTrue : MagickFalse;
+}
+
 
 /**
  * Return true if all the pixels in the image have the same red, green, and blue intensities.
@@ -7938,11 +7946,7 @@ has_image_attribute(VALUE self, MagickBooleanType (attr_test)(const Image *))
 VALUE
 Image_gray_q(VALUE self)
 {
-#if defined(HAVE_SETIMAGEGRAY)
-    return has_attribute(self, (MagickBooleanType (*)(const Image *, ExceptionInfo *))SetImageGray);
-#else
-    return has_attribute(self, IsGrayImage);
-#endif
+    return has_attribute(self, Image_is_gray_colorspace_type);
 }
 
 
@@ -8672,6 +8676,7 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
 #endif
     if (!okay)
     {
+        DestroyImage(new_image);
         rb_raise(rb_eRuntimeError, "LevelImageColors failed for unknown reason.");
     }
 
@@ -8753,6 +8758,7 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
 
     if (!okay)
     {
+        DestroyImage(new_image);
         rb_raise(rb_eRuntimeError, "LevelizeImageChannel failed for unknown reason.");
     }
     return rm_image_new(new_image);
@@ -11355,15 +11361,24 @@ Image_random_threshold_channel(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 
 #if defined(IMAGEMAGICK_7)
-    BEGIN_CHANNEL_MASK(new_image, channels);
     {
         GeometryInfo geometry_info;
 
-        ParseGeometry(thresholds, &geometry_info);
-        GVL_STRUCT_TYPE(RandomThresholdImage) args = { new_image, geometry_info.rho, geometry_info.sigma, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RandomThresholdImage), &args);
+        if (ParseGeometry(thresholds, &geometry_info) == NoValue && *thresholds)
+        {
+            (void) ThrowMagickException(exception, GetMagickModule(), OptionError,
+                                        "InvalidArgument", "'%s'", thresholds);
+        }
+        else
+        {
+            BEGIN_CHANNEL_MASK(new_image, channels);
+            {
+                GVL_STRUCT_TYPE(RandomThresholdImage) args = { new_image, geometry_info.rho, geometry_info.sigma, exception };
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RandomThresholdImage), &args);
+            }
+            END_CHANNEL_MASK(new_image);
+        }
     }
-    END_CHANNEL_MASK(new_image);
 #else
     GVL_STRUCT_TYPE(RandomThresholdImageChannel) args = { new_image, channels, thresholds, exception };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RandomThresholdImageChannel), &args);

data/ext/RMagick/rmkinfo.cpp

@@ -162,6 +162,10 @@ VALUE
 KernelInfo_clone(VALUE self)
 {
     KernelInfo *kernel = CloneKernelInfo((KernelInfo*)DATA_PTR(self));
+    if (!kernel)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
     return TypedData_Wrap_Struct(Class_KernelInfo, &rm_kernel_info_data_type, kernel);
 }
 
@@ -180,12 +184,17 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
     KernelInfo *kernel;
     KernelInfoType kernel_type;
     GeometryInfo info;
+    const char *geom_str;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
 
     VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
-    ParseGeometry(StringValueCStr(geometry), &info);
+    geom_str = StringValueCStr(geometry);
+    if (ParseGeometry(geom_str, &info) == NoValue && *geom_str)
+    {
+        rb_raise(rb_eArgError, "invalid geometry string");
+    }
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();

data/ext/RMagick/rmmain.cpp

@@ -214,6 +214,12 @@ static void set_managed_memory(void)
 
 
 
+static void
+rmagick_terminus(VALUE unused)
+{
+    MagickCoreTerminus();
+}
+
 /**
  * Define the classes and constants.
  *
@@ -231,6 +237,7 @@ Init_RMagick2(void)
     set_managed_memory();
 
     MagickCoreGenesis("RMagick", MagickFalse);
+    rb_set_end_proc(rmagick_terminus, Qnil);
 
     test_Magick_version();
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '7.0.0'
+  VERSION = '7.0.2'
   MIN_RUBY_VERSION = '3.2.0'
   MIN_IM6_VERSION = '6.9.0'
   MIN_IM7_VERSION = '7.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Tim Hunter
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.9.0+ (for ImageMagick 6) or 7.1.0+ (for ImageMagick 7)
-rubygems_version: 4.0.11
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []