rmagick 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1d40197e527e46372e4ad8c265c3f2e929eddd
-  data.tar.gz: d559dc36017d771ac142cc90029037402c355e4d
+  metadata.gz: beb83114bca52271ffbe728210030f1fe165e0b3
+  data.tar.gz: aa899f36246d733532c30056f5a2c25a96e4e111
 SHA512:
-  metadata.gz: 577e9dcde875183b07218696b2302e73849e292b632c5464294320583e2c209971e0958cf96faf14a3c45e11c76b2af90eab1b5c0b743fdeefabd87296d9ae74
-  data.tar.gz: 63ccbc7117ba02dbd5229f3ebbb52bf1d135aea0a73ca1bbcd5d1df80088798926e6cb9eb29d29552972e2cf283d33d79a7dbf8af4135f6965345448d2ef994a
+  metadata.gz: b05b73eb4085af7f55727f85febbe437625c217380312828d06110767b67ee6108fd0bd74d6a0949b9eb93f759243048d25a84a8061d8892be0b698684d8fbd9
+  data.tar.gz: 430a64346546bf3f8efcbcada84b88f501b4db0713e7d44aafd6ec333152232d61d19eb07d1ef17b7f4163e9738c9d5cdb5d4912bfe9d31d692c76c3aa43ab16

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -1,9 +1,22 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-08 00:25:41 +0300 using RuboCop version 0.29.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
+# Custom configuration, edit with care! This gem needs to be backwards
+# compatible with Ruby 1.8:
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/DeprecatedHashMethods:
+  Enabled: false
+
+# TODO: How to warn if stabby proc is used?
+Style/Lambda:
+  Enabled: false
+
+# Auto-generated config to be cleaned up and deleted:
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/BlockAlignment:
+  Enabled: false
 
 # Offense count: 1
 Lint/HandleExceptions:
@@ -35,9 +48,9 @@ Lint/UnusedMethodArgument:
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 187
+# Offense count: 183
 Metrics/AbcSize:
-  Max: 567
+  Max: 559
 
 # Offense count: 1
 Metrics/BlockNesting:
@@ -46,18 +59,18 @@ Metrics/BlockNesting:
 # Offense count: 17
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1124
+  Max: 1099
 
 # Offense count: 22
 Metrics/CyclomaticComplexity:
   Max: 42
 
-# Offense count: 886
+# Offense count: 844
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 278
+  Max: 276
 
-# Offense count: 180
+# Offense count: 178
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 157
@@ -85,7 +98,12 @@ Style/BarePercentLiterals:
 Style/CaseEquality:
   Enabled: false
 
-# Offense count: 14
+# Offense count: 63
+# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
+Style/CaseIndentation:
+  Enabled: false
+
+# Offense count: 13
 Style/ClassAndModuleCamelCase:
   Enabled: false
 
@@ -94,23 +112,25 @@ Style/ClassAndModuleCamelCase:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 126
-Style/ConstantName:
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ClosingParenthesisIndentation:
   Enabled: false
 
-# Offense count: 12
+# Offense count: 5
 # Cop supports --auto-correct.
-Style/DeprecatedHashMethods:
+Style/CommentIndentation:
   Enabled: false
 
-# Offense count: 63
-Style/Documentation:
+# Offense count: 126
+Style/ConstantName:
   Enabled: false
 
-Style/DotPosition:
-  EnforcedStyle: leading
+# Offense count: 62
+Style/Documentation:
+  Enabled: false
 
-# Offense count: 24
+# Offense count: 23
 # Configuration parameters: Exclude.
 Style/FileName:
   Enabled: false
@@ -120,31 +140,35 @@ Style/FileName:
 Style/FormatString:
   Enabled: false
 
-# Offense count: 43
+# Offense count: 45
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
+# Offense count: 29
 # Cop supports --auto-correct.
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-# Offense count: 28
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 651
 # Cop supports --auto-correct.
-Style/Lambda:
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentationConsistency:
   Enabled: false
 
-# Offense count: 48
+# Offense count: 1049
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Enabled: false
+
+# Offense count: 47
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
   Enabled: false
@@ -154,8 +178,11 @@ Style/LeadingCommentSpace:
 Style/MethodName:
   Enabled: false
 
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
+  Enabled: false
 
 # Offense count: 1
 Style/MultilineTernaryOperator:
@@ -175,7 +202,7 @@ Style/NumericLiterals:
 Style/OpMethod:
   Enabled: false
 
-# Offense count: 19
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -191,8 +218,9 @@ Style/PerlBackrefs:
 Style/PredicateName:
   Enabled: false
 
-# Offense count: 3
-# Configuration parameters: MaxSlashes.
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 Style/RegexpLiteral:
   Enabled: false
 
@@ -200,6 +228,12 @@ Style/RegexpLiteral:
 Style/RescueModifier:
   Enabled: false
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Enabled: false
+
 # Offense count: 2
 # Configuration parameters: Methods.
 Style/SingleLineBlockParams:
@@ -210,7 +244,7 @@ Style/SingleLineBlockParams:
 Style/SingleSpaceBeforeFirstArg:
   Enabled: false
 
-# Offense count: 1112
+# Offense count: 1114
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
   Enabled: false
@@ -221,18 +255,19 @@ Style/SpaceAfterComma:
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# Offense count: 1060
+# Offense count: 1066
 # Cop supports --auto-correct.
+# Configuration parameters: MultiSpaceAllowedForOperators.
 Style/SpaceAroundOperators:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/SpaceBeforeBlockBraces:
   Enabled: false
 
-# Offense count: 209
+# Offense count: 204
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 Style/SpaceInsideBlockBraces:
@@ -251,15 +286,9 @@ Style/SpaceInsideHashLiteralBraces:
 
 # Offense count: 35
 # Cop supports --auto-correct.
-# Many method calls in consecutive lines in RMagick have parameters aligned vertically.
-# Therefore this cop should better be disabled.
-# But you can delete this rule temporarily, run `rubocop -a`, and commit good fixes only.
 Style/SpaceInsideParens:
   Enabled: false
 
-Style/StringLiterals:
-  EnforcedStyle: single_quotes
-
 # Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
@@ -272,6 +301,11 @@ Style/SymbolProc:
 Style/TrailingComma:
   Enabled: false
 
+# Offense count: 204
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Enabled: false
+
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/VariableName:

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+*This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)*

data/CONTRIBUTING.md

@@ -4,7 +4,9 @@ RMagick Contributor's Guide
 Welcome
 -------
 
-Thank you for considering contributing to RMagick. Your contribution is always welcome!
+Thank you for considering contributing to RMagick. Your contribution is always welcome and appreciated!
+
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
 
 Background
@@ -18,5 +20,21 @@ RMagick is a Ruby gem with a C extension. The extension wraps the ImageMagick C
 Priorities
 ----------
 
-9. Green build of the gem on all operating systems. You can see the current build state on [the project page at Travis CI](https://travis-ci.org/gemhome/rmagick). You are welcome to improve it.
-9. [Open issues](https://github.com/gemhome/rmagick/issues). You are welcome to reproduce them, report current state, suggest solutions, open pull requests with fixes.
+1. Green build of the gem on all operating systems. You can see the current build state on [the project page at Travis CI](https://travis-ci.org/gemhome/rmagick). You are welcome to improve it.
+2. [Open issues](https://github.com/gemhome/rmagick/issues). You are welcome to reproduce them, report current state, suggest solutions, open pull requests with fixes. If you don't know where to start, sort issues by least recently updated. You can also [subscribe to receive random issues by email](http://www.codetriage.com/gemhome/rmagick).
+
+
+Testing
+-------
+
+Our goal is to migrate to [RSpec](http://rspec.info).
+
+If you write new tests, please do it in RSpec.
+
+You are also welcome to convert existing Test/Unit tests to RSpec.
+
+
+Committing
+----------
+
+It is better if you follow [Git Style Guide](https://github.com/agis-/git-style-guide).

data/ChangeLog

@@ -1,4 +1,9 @@
-HEAD
+RMagick 2.15.0
+    o Ability to remove alpha channel - @ollie
+    o C local variables guarded against GC to avoid segfaults - @u338steven
+    o trace_proc protected with a mutex to avoid segfaults - @u338steven
+
+RMagick 2.14.0
     o RMagick.rb moved to deprecated directory - @mockdeep
     o Better ImageMagick feature detection - @bf4
     o Prevent compilation failures if prefix is an empty string - @voxik

data/Rakefile

@@ -21,7 +21,7 @@ task :config do
   end
 end
 
-desc 'abort when repo nto clean or has uncommited code'
+desc 'abort when repo is not clean or has uncommited code'
 task :assert_clean_repo do
   sh('git diff --exit-code')
   abort 'Git repo not clean' unless $CHILD_STATUS.success?
@@ -165,6 +165,8 @@ end
 
 require 'rake/extensiontask'
 require 'rake/testtask'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 Rake::ExtensionTask.new('RMagick2') do |ext|
   ext.ext_dir = 'ext/RMagick'
@@ -175,11 +177,12 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task :test => :compile
+task :spec => :compile
 
 if ENV['STYLE_CHECKS']
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-  task :default => [:test, :rubocop]
+  task :default => [:spec, :test, :rubocop]
 else
-  task :default => :test
+  task :default => [:spec, :test]
 end

data/ext/RMagick/extconf.rb

@@ -357,7 +357,8 @@ SRC
       #check_sizeof("Image *", headers)
 
       have_enum_values('AlphaChannelType', ['CopyAlphaChannel',                    # 6.4.3-7
-                                            'BackgroundAlphaChannel'], headers)    # 6.5.2-5
+                                            'BackgroundAlphaChannel',              # 6.5.2-5
+                                            'RemoveAlphaChannel'], headers)        # 6.7.5-1
       have_enum_values('CompositeOperator', ['BlurCompositeOp',                    # 6.5.3-7
                                              'DistortCompositeOp',                 # 6.5.3-10
                                              'LinearBurnCompositeOp',              # 6.5.4-3

data/ext/RMagick/rmagick.c

@@ -34,7 +34,7 @@ Magick_colors(VALUE class)
 {
     const ColorInfo **color_info_list;
     size_t number_colors, x;
-    volatile VALUE ary;
+    VALUE ary;
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
@@ -62,6 +62,7 @@ Magick_colors(VALUE class)
         }
 
         magick_free((void *)color_info_list);
+        RB_GC_GUARD(ary);
         return ary;
     }
 }
@@ -83,7 +84,7 @@ Magick_fonts(VALUE class)
 {
     const TypeInfo **type_info;
     size_t number_types, x;
-    volatile VALUE ary;
+    VALUE ary;
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
@@ -108,6 +109,7 @@ Magick_fonts(VALUE class)
             (void) rb_ary_push(ary, Import_TypeInfo((const TypeInfo *)type_info[x]));
         }
         magick_free((void *)type_info);
+        RB_GC_GUARD(ary);
         return ary;
     }
 
@@ -167,7 +169,7 @@ Magick_init_formats(VALUE class)
 {
     const MagickInfo **magick_info;
     size_t number_formats, x;
-    volatile VALUE formats;
+    VALUE formats;
     ExceptionInfo *exception;
 
     class = class;      // defeat "never referenced" message from icc
@@ -186,6 +188,7 @@ Magick_init_formats(VALUE class)
                             , rb_str_new2(magick_info[x]->name)
                             , MagickInfo_to_format((const MagickInfo *)magick_info[x]));
     }
+    RB_GC_GUARD(formats);
     return formats;
 }
 
@@ -206,7 +209,7 @@ Magick_init_formats(VALUE class)
 VALUE
 Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 {
-    volatile VALUE resource, limit;
+    VALUE resource, limit;
     ResourceType res = UndefinedResource;
     char *str;
     ID id;
@@ -280,6 +283,8 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             break;
     }
 
+    RB_GC_GUARD(resource);
+
     cur_limit = GetMagickResourceLimit(res);
 
     if (argc > 1)
@@ -287,6 +292,8 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
         (void) SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
     }
 
+    RB_GC_GUARD(limit);
+
     return ULONG2NUM(cur_limit);
 }