colourdistance 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b535e4a5714978f5f0d0ca48f2effec4cf28169d
-  data.tar.gz: eb1a65487e25cc8defef3ece24d8b8a68ad2beee
+  metadata.gz: 4b1e9cb5ecb0868206f36d2a42f7df9d19a51981
+  data.tar.gz: 828374831b463c92993dd435eb5a75369e67f6c6
 SHA512:
-  metadata.gz: 4777c6322351453bf999d6658a70b7e64c351fdd8e5a70b503f6e61ea64be377727d0510c86ef7faa318aa12878f96b74a2a582d1f95f5d5cbe2e216334f6da2
-  data.tar.gz: 895ca4675ed7d0f4df96c579493244212aa1ac0222057ee889046d4c53a556292e0c272e95a918f234705144459de7ca549a244dbd6b0294a36cb10765dc509e
+  metadata.gz: a567cab03251e6c22b95db587792fc506cccdab0f6938e778f4a6a10ea379992b78fa8ba59f461327aba1ac0e270824389a9452bf8e4175bbeaa00b6d56eee59
+  data.tar.gz: ce53b37f3cc814c5d14c7581c8262dd1eb44e6bb392430de04870dab66af5db261410d4123acbd5de13d32d4933908504e62e1872963ccd03be5ba48d8ed89d6

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require "inline"
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/colourdistance.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "RubyInline", "~>3.12.4"
   spec.add_development_dependency "rspec"
 end

data/lib/colourdistance.rb

@@ -1,6 +1,273 @@
 require "colourdistance/version"
-require "colourdiff"
+require "inline"
 
 module Colourdistance
-  extend Colourdiff
+  inline(:C) do |builder|
+    builder.include '<stdio.h>'
+    builder.include '<math.h>'
+
+    builder.c_singleton 'VALUE ciede94(VALUE color1, VALUE color2) {
+      double pi = 3.1415927;
+      double e = 2.7182818;
+      double l1;
+      double l2;
+      double a1;
+      double a2;
+
+      
+      double r1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("r"))))/255.0;
+      double g1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("g"))))/255.0;
+      double b1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("b"))))/255.0;
+
+      double r2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("r"))))/255.0;
+      double g2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("g"))))/255.0;
+      double b2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("b"))))/255.0;
+
+      r1 = ((r1 <= 0.04045) ? r1 / 12.92 : pow(((r1 + 0.055) / 1.055),2.4));
+      g1 = ((g1 <= 0.04045) ? g1 / 12.92 : pow(((g1 + 0.055) / 1.055),2.4));
+      b1 = ((b1 <= 0.04045) ? b1 / 12.92 : pow(((b1 + 0.055) / 1.055),2.4));
+
+      r2 = ((r2 <= 0.04045) ? r2 / 12.92 : pow(((r2 + 0.055) / 1.055),2.4));
+      g2 = ((g2 <= 0.04045) ? g2 / 12.92 : pow(((g2 + 0.055) / 1.055),2.4));
+      b2 = ((b2 <= 0.04045) ? b2 / 12.92 : pow(((b2 + 0.055) / 1.055),2.4));
+
+      double x1 = 0.412453 * r1 + 0.357580 * g1 + 0.180423 * b1;
+      double y1 = 0.212671 * r1 + 0.715160 * g1 + 0.072169 * b1;
+      double z1 = 0.019334 * r1 + 0.119193 * g1 + 0.950227 * b1;
+
+      double x2 = 0.412453 * r2 + 0.357580 * g2 + 0.180423 * b2;
+      double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
+      double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
+
+      double fx;
+      double fy;
+      double fz;
+
+      if(x1 <= 0.008856){
+        fx = 7.787 * x1/0.95047 + 16.0/116.0;
+      }else{
+        fx = cbrt(x1/0.95047);
+      }
+
+      if(y1 <= 0.008856){
+        l1 = 903.3 * y1;
+        fy = (7.787 * y1 + 16.0/116.0);
+      }else{
+        l1 = 116.0 * cbrt(y1) - 16.0;
+        fy = cbrt(y1);
+      }
+
+      if(z1 <= 0.008856){
+        fz = 7.787 * z1/1.08883 + 16.0/116.0;
+      }else{
+        fz = cbrt(z1/1.08883);
+      }
+
+      a1 = 500.0 * (fx-fy);
+      b1 = 200.0 * (fy-fz);
+
+
+      if(x2 <= 0.008856){
+        fx = (7.787 * x2/0.95047 + 16.0/116.0);
+      }else{
+        fx = cbrt(x2/0.95047);
+      }
+
+      if(y2 <= 0.008856){
+        l2 = 903.3 * y2;
+        fy = (7.787 * y2 + 16.0/116.0);
+      }else{
+        l2 = 116.0 * cbrt(y2) - 16.0;
+        fy = cbrt(y2);
+      }
+
+      if(z2 <= 0.008856){
+        fz = (7.787 * z2/1.08883 + 16.0/116.0);
+      }else{
+        fz = cbrt(z2/1.08883);
+      }
+
+      a2 = 500.0 * (fx-fy);
+      b2 = 200.0 * (fy-fz);
+
+      double kl = 2.0;
+      double k1 = 0.048;
+      double k2 = 0.014;
+
+      double c1 = sqrt(a1*a1+b1*b1);
+      double c2 = sqrt(a2*a2+b2*b2);
+      double cdelta = c2 - c1;
+
+      double sc = 1.0 + k1 * c1;
+      double sh = 1.0 + k2 * c1;
+
+      double habdelta = sqrt((a2-a1)*(a2-a1)+(b2-b1)*(b2-b1) - cdelta*cdelta);
+
+      double ldiff = (l1 - l2)/kl;
+      double adiff = cdelta/sc;
+      double bdiff = habdelta/sh;
+
+      return DBL2NUM(sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff)/50.0);
+    }'
+
+    builder.c_singleton 'VALUE ciede2000(VALUE color1, VALUE color2) {
+      double pi = 3.1415927;
+      double e = 2.7182818;
+      double conversion = pi/180;
+      double _kL = 1.0;
+      double _kC = 1.0;
+      double _kH = 1.0;
+      double l1;
+      double l2;
+      double a1;
+      double a2;
+
+      double r1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("r"))))/255.0;
+      double g1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("g"))))/255.0;
+      double b1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("b"))))/255.0;
+
+      double r2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("r"))))/255.0;
+      double g2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("g"))))/255.0;
+      double b2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("b"))))/255.0;
+
+      r1 = ((r1 <= 0.04045) ? r1 / 12.92 : pow(((r1 + 0.055) / 1.055),2.4));
+      g1 = ((g1 <= 0.04045) ? g1 / 12.92 : pow(((g1 + 0.055) / 1.055),2.4));
+      b1 = ((b1 <= 0.04045) ? b1 / 12.92 : pow(((b1 + 0.055) / 1.055),2.4));
+
+      r2 = ((r2 <= 0.04045) ? r2 / 12.92 : pow(((r2 + 0.055) / 1.055),2.4));
+      g2 = ((g2 <= 0.04045) ? g2 / 12.92 : pow(((g2 + 0.055) / 1.055),2.4));
+      b2 = ((b2 <= 0.04045) ? b2 / 12.92 : pow(((b2 + 0.055) / 1.055),2.4));
+
+      double x1 = 0.412453 * r1 + 0.357580 * g1 + 0.180423 * b1;
+      double y1 = 0.212671 * r1 + 0.715160 * g1 + 0.072169 * b1;
+      double z1 = 0.019334 * r1 + 0.119193 * g1 + 0.950227 * b1;
+
+      double x2 = 0.412453 * r2 + 0.357580 * g2 + 0.180423 * b2;
+      double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
+      double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
+
+      double fx;
+      double fy;
+      double fz;
+
+      if(x1 <= 0.008856){
+        fx = 7.787 * x1/0.95047 + 16.0/116.0;
+      }else{
+        fx = cbrt(x1/0.95047);
+      }
+
+      if(y1 <= 0.008856){
+        l1 = 903.3 * y1;
+        fy = (7.787 * y1 + 16.0/116.0);
+      }else{
+        l1 = 116.0 * cbrt(y1) - 16.0;
+        fy = cbrt(y1);
+      }
+
+      if(z1 <= 0.008856){
+        fz = 7.787 * z1/1.08883 + 16.0/116.0;
+      }else{
+        fz = cbrt(z1/1.08883);
+      }
+
+      a1 = 500.0 * (fx-fy);
+      b1 = 200.0 * (fy-fz);
+
+      if(x2 <= 0.008856){
+        fx = (7.787 * x2/0.95047 + 16.0/116.0);
+      }else{
+        fx = cbrt(x2/0.95047);
+      }
+
+      if(y2 <= 0.008856){
+        l2 = 903.3 * y2;
+        fy = (7.787 * y2 + 16.0/116.0);
+      }else{
+        l2 = 116.0 * cbrt(y2) - 16.0;
+        fy = cbrt(y2);
+      }
+
+      if(z2 <= 0.008856){
+        fz = (7.787 * z2/1.08883 + 16.0/116.0);
+      }else{
+        fz = cbrt(z2/1.08883);
+      }
+
+      a2 = 500.0 * (fx-fy);
+      b2 = 200.0 * (fy-fz);
+
+      double c1 = sqrt(a1*a1+b1*b1);
+      double c2 = sqrt(a2*a2+b2*b2);
+      double cdelta = c2 - c1;
+
+      double lbar = (l1 + l2)/2.0;
+      double cbar = (c1 + c2)/2.0;
+
+      double lbaradj = (lbar - 50.0)*(lbar - 50.0);
+      double cbaradj = sqrt(pow(cbar,7)/(pow(cbar,7)+6103515625.0));
+
+      double a1prime = a1 + (a1/2.0) * (1.0-cbaradj);
+      double a2prime = a2 + (a2/2.0) * (1.0-cbaradj);
+
+      double c1prime = sqrt(a1prime*a1prime+b1*b1);
+      double c2prime = sqrt(a2prime*a2prime+b2*b2);
+      double cprime = (c1prime + c2prime)/2.0;
+      double cprimeadj = sqrt(pow(cprime,7)/(pow(cprime,7)+6103515625.0));
+      double cprimedelta = c2prime - c1prime;
+
+      double h1;
+      double h2;
+      if(c1 == 0.0){
+        h1 = 0.0;
+      }else{
+        h1 = fmod(atan2(b1,a1prime)*180.0/pi,360.0);
+      }
+      if(c2 == 0.0){
+        h2 = 0.0;
+      }else{
+        h2 = fmod(atan2(b2,a2prime)*180.0/pi,360.0);
+      }
+
+      double h;
+      if (fabs(h2 - h1) <= 180.0){
+        h = h2 - h1;
+      }else if(h2 <= h1){
+        h = h2 - h1 + 360.0;
+      }else{
+        h = h2 - h1 - 360.0;
+      }
+
+      double hdelta = 2.0 * sqrt(c1prime * c2prime) * sin(conversion*h/2.0);
+      double hprime = (h1 + h2)/2.0;
+      if (fabs(h1 - h2) > 180.0){
+        hprime += 180.0;
+      }
+      if(c1prime == 0.0 || c2prime == 0.0){
+        hprime *= 2.0;
+      }
+
+      double t = 1.0 - 0.17*cos(conversion*(hprime-30.0)) +
+                  0.24*cos(conversion*(2.0*hprime)) +
+                  0.32*cos(conversion*(3.0*hprime + 6.0)) -
+                  0.20*cos(conversion*(4.0*hprime-63.0));
+
+      double sl = 1.0 + 0.015 * lbaradj/sqrt(20+lbaradj);
+      double sc = 1.0 + 0.045*cprime;
+      double sh = 1.0 + 0.015*cprime*t;
+
+      if (hprime < 0.0){
+        hprime += 360.0;
+      }
+
+      double rt = -2.0*cprimeadj*sin(conversion*60.0*pow(e,(hprime-275.0)*(hprime-275.0)/(-625.0)));
+
+      double ldiff = (l1 - l2)/sl;
+      double adiff = cprimedelta/sc;
+      double bdiff = hdelta/sh;
+      double rdiff = rt*adiff*bdiff;
+      double val = sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff+rdiff)/100.0;
+
+      return DBL2NUM(val);
+    }'
+  end
 end

data/lib/colourdistance/version.rb

@@ -1,3 +1,3 @@
 module Colourdistance
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colourdistance
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Orange Seven
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: RubyInline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.12.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.12.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,19 +80,11 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE.txt
-- Makefile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - colourdistance.gemspec
-- ext/Colourdiff.bundle
-- ext/Makefile
-- ext/colourdiff.c
-- ext/colourdiff.o
-- ext/colourdistance.o
-- ext/extconf.rb
-- lib/Colourdiff.bundle
 - lib/colourdistance.rb
 - lib/colourdistance/version.rb
 homepage: 

data/Makefile

@@ -1,238 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = ext
-topdir = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0
-hdrdir = $(topdir)
-arch_hdrdir = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin14
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(DESTDIR)/Library/Ruby/Site
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(DESTDIR)/usr/share/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(DESTDIR)/usr/share/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = /usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(DESTDIR)/Library/Ruby/Site
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC = xcrun clang
-CXX = xcrun clang++
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = 
-debugflags = -g
-warnflags = 
-CCDLFLAGS = 
-CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(ARCH_FLAG) -g -Os -pipe  $(ARCH_FLAG)
-ldflags  = -L. -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG =  -arch x86_64 -arch i386
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby.2.0.0
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = universal-darwin14
-sitearch = $(arch)
-ruby_version = 2.0.0
-ruby = $(bindir)/ruby
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
-ORIG_SRCS = colourdiff.c
-SRCS = $(ORIG_SRCS) 
-OBJS = colourdiff.o
-HDRS = 
-TARGET = Colourdiff
-TARGET_NAME = Colourdiff
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(DESTDIR)$(bindir)
-RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(DESTDIR)$(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(DESTDIR)$(sitearchdir)$(target_prefix)
-HDRDIR        = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) ./.RUBYARCHDIR.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default Colourdiff libraries
-./.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)

data/ext/Makefile

@@ -1,238 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0
-hdrdir = $(topdir)
-arch_hdrdir = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin14
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(DESTDIR)/Library/Ruby/Site
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(DESTDIR)/usr/share/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(DESTDIR)/usr/share/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = /usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(DESTDIR)/Library/Ruby/Site
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC = xcrun clang
-CXX = xcrun clang++
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = 
-debugflags = -g
-warnflags = 
-CCDLFLAGS = 
-CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(ARCH_FLAG) -g -Os -pipe  $(ARCH_FLAG)
-ldflags  = -L. -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG =  -arch x86_64 -arch i386
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby.2.0.0
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = universal-darwin14
-sitearch = $(arch)
-ruby_version = 2.0.0
-ruby = $(bindir)/ruby
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
-ORIG_SRCS = colourdiff.c
-SRCS = $(ORIG_SRCS) 
-OBJS = colourdiff.o
-HDRS = 
-TARGET = Colourdiff
-TARGET_NAME = Colourdiff
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(DESTDIR)$(bindir)
-RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(DESTDIR)$(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(DESTDIR)$(sitearchdir)$(target_prefix)
-HDRDIR        = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) ./.RUBYARCHDIR.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default Colourdiff libraries
-./.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)

data/ext/colourdiff.c

@@ -1,172 +0,0 @@
-#include <ruby.h>
-#include <stdio.h>
-#include <math.h>
-
-VALUE Colourdiff = Qnil;  /* Ruby Module */
-
-VALUE method_ciede2000(VALUE self, VALUE color1, VALUE color2) {
-      double pi = 3.1415927;
-      double e = 2.7182818;
-      double conversion = pi/180.0;
-      double _kL = 1.0;
-      double _kC = 1.0;
-      double _kH = 1.0;
-      double l1;
-      double l2;
-      double a1;
-      double a2;
-
-      double r1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("r"))))/255.0;
-      double g1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("g"))))/255.0;
-      double b1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("b"))))/255.0;
-
-      double r2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("r"))))/255.0;
-      double g2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("g"))))/255.0;
-      double b2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("b"))))/255.0;
-
-      r1 = ((r1 <= 0.04045) ? r1 / 12.92 : pow(((r1 + 0.055) / 1.055),2.4));
-      g1 = ((g1 <= 0.04045) ? g1 / 12.92 : pow(((g1 + 0.055) / 1.055),2.4));
-      b1 = ((b1 <= 0.04045) ? b1 / 12.92 : pow(((b1 + 0.055) / 1.055),2.4));
-
-      r2 = ((r2 <= 0.04045) ? r2 / 12.92 : pow(((r2 + 0.055) / 1.055),2.4));
-      g2 = ((g2 <= 0.04045) ? g2 / 12.92 : pow(((g2 + 0.055) / 1.055),2.4));
-      b2 = ((b2 <= 0.04045) ? b2 / 12.92 : pow(((b2 + 0.055) / 1.055),2.4));
-
-      double x1 = 0.412453 * r1 + 0.357580 * g1 + 0.180423 * b1;
-      double y1 = 0.212671 * r1 + 0.715160 * g1 + 0.072169 * b1;
-      double z1 = 0.019334 * r1 + 0.119193 * g1 + 0.950227 * b1;
-
-      double x2 = 0.412453 * r2 + 0.357580 * g2 + 0.180423 * b2;
-      double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
-      double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
-
-      double fx;
-      double fy;
-      double fz;
-
-      if(x1 <= 0.008856){
-        fx = 7.787 * x1/0.95047 + 16.0/116.0;
-      }else{
-        fx = cbrt(x1/0.95047);
-      }
-
-      if(y1 <= 0.008856){
-        l1 = 903.3 * y1;
-        fy = (7.787 * y1 + 16.0/116.0);
-      }else{
-        l1 = 116.0 * cbrt(y1) - 16.0;
-        fy = cbrt(y1);
-      }
-
-      if(z1 <= 0.008856){
-        fz = 7.787 * z1/1.08883 + 16.0/116.0;
-      }else{
-        fz = cbrt(z1/1.08883);
-      }
-
-      a1 = 500.0 * (fx-fy);
-      b1 = 200.0 * (fy-fz);
-
-      if(x2 <= 0.008856){
-        fx = (7.787 * x2/0.95047 + 16.0/116.0);
-      }else{
-        fx = cbrt(x2/0.95047);
-      }
-
-      if(y2 <= 0.008856){
-        l2 = 903.3 * y2;
-        fy = (7.787 * y2 + 16.0/116.0);
-      }else{
-        l2 = 116.0 * cbrt(y2) - 16.0;
-        fy = cbrt(y2);
-      }
-
-      if(z2 <= 0.008856){
-        fz = (7.787 * z2/1.08883 + 16.0/116.0);
-      }else{
-        fz = cbrt(z2/1.08883);
-      }
-
-      a2 = 500.0 * (fx-fy);
-      b2 = 200.0 * (fy-fz);
-
-      double c1 = sqrt(a1*a1+b1*b1);
-      double c2 = sqrt(a2*a2+b2*b2);
-      double cdelta = c2 - c1;
-
-      double lbar = (l1 + l2)/2.0;
-      double cbar = (c1 + c2)/2.0;
-
-      double lbaradj = (lbar - 50.0)*(lbar - 50.0);
-      double cbaradj = sqrt(pow(cbar,7)/(pow(cbar,7)+6103515625.0));
-
-      double a1prime = a1 + (a1/2.0) * (1.0-cbaradj);
-      double a2prime = a2 + (a2/2.0) * (1.0-cbaradj);
-
-      double c1prime = sqrt(a1prime*a1prime+b1*b1);
-      double c2prime = sqrt(a2prime*a2prime+b2*b2);
-      double cprime = (c1prime + c2prime)/2.0;
-      double cprimeadj = sqrt(pow(cprime,7)/(pow(cprime,7)+6103515625.0));
-      double cprimedelta = c2prime - c1prime;
-
-      double h1;
-      double h2;
-      if(c1 == 0.0){
-        h1 = 0.0;
-      }else{
-        h1 = fmod(atan2(b1,a1prime)*180.0/pi,360.0);
-      }
-      if(c2 == 0.0){
-        h2 = 0.0;
-      }else{
-        h2 = fmod(atan2(b2,a2prime)*180.0/pi,360.0);
-      }
-
-      double h;
-      if (fabs(h2 - h1) <= 180.0){
-        h = h2 - h1;
-      }else if(h2 <= h1){
-        h = h2 - h1 + 360.0;
-      }else{
-        h = h2 - h1 - 360.0;
-      }
-
-      double hdelta = 2.0 * sqrt(c1prime * c2prime) * sin(conversion*h/2.0);
-      double hprime = (h1 + h2)/2.0;
-      if (fabs(h1 - h2) > 180.0){
-        hprime += 180.0;
-      }
-      if(c1prime == 0.0 || c2prime == 0.0){
-        hprime *= 2.0;
-      }
-
-      double t = 1.0 - 0.17*cos(conversion*(hprime-30.0)) +
-                  0.24*cos(conversion*(2.0*hprime)) +
-                  0.32*cos(conversion*(3.0*hprime + 6.0)) -
-                  0.20*cos(conversion*(4.0*hprime-63.0));
-
-      double sl = 1.0 + 0.015 * lbaradj/sqrt(20+lbaradj);
-      double sc = 1.0 + 0.045*cprime;
-      double sh = 1.0 + 0.015*cprime*t;
-
-      if (hprime < 0.0){
-        hprime += 360.0;
-      }
-
-      double rt = -2.0*cprimeadj*sin(conversion*60.0*pow(e,(hprime-275.0)*(hprime-275.0)/(-625.0)));
-
-      double ldiff = (l1 - l2)/sl;
-      double adiff = cprimedelta/sc;
-      double bdiff = hdelta/sh;
-      double rdiff = rt*adiff*bdiff;
-      double val = sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff+rdiff)/100.0;
-
-      return DBL2NUM(val);
-    }
-
-
-void Init_colourdiff() {
-    Colourdiff = rb_define_module("Colourdiff");
-    rb_define_singleton_method(Colourdiff, "ciede2000", method_ciede2000, 2);
-}
-

data/ext/extconf.rb

@@ -1,6 +0,0 @@
-require 'mkmf';
-
-# extension name
-extname = 'Colourdiff';
-
-create_makefile(extname);