colordom 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e428a11ebd273b9e3f8867468f74eff34cc681426e97133ec4cbce666c9006ce
-  data.tar.gz: e7d31a241c15cdd96b078f60ae8ae302d81206f691b0d50ff8208b2d526803e9
+  metadata.gz: 36630f3459a8b4c4ab4dc464bd98d9e6f90d5d3684c1520abc7241e5c6c5032c
+  data.tar.gz: ea5171ee0afce0635bb9bf1aa9b83d7b2499c3c4c8db6e433677ba5fc339b6a3
 SHA512:
-  metadata.gz: 5545da4d90450efee71fb4b1d078760d4820a703497a2cc7c3ba785f6be6f8caef49e218dcf011052c8ee6affbb1cf6b736b5be5210e0209ef4d5179a3ff73e1
-  data.tar.gz: 78350ba55457fc55e4429854b343a10a639137a8daeb3379e431425da93d48580bce4efed1707c744dd911a56b160664c0db6980eebe20802238d7e3d4ee3211
+  metadata.gz: 347d94b5bad2abf596203a1364e308803fcd509d110f0bbfd589da19043c47c1ce054f7c3dd40bcfd79f7cd931d52dbe18f10c1d2d9e957e9baf628df7ec99cf
+  data.tar.gz: b51088add6ccaffd435e2696e75d7096f18dd9472b82f19327956f02a0f569c13a1504be1be8b9aa732bbf2466f68ad19842169352f3c5a096f250c57dc6ca2b

data/Gemfile

@@ -6,3 +6,6 @@ gemspec
 gem 'benchmark-ips'
 gem 'benchmark-memory'
 gem 'camalian'
+gem 'colorscore'
+gem 'miro', github: 'jonbuda/miro'
+gem 'chunky_png', '1.3.15'

data/README.md

@@ -1,10 +1,10 @@
 # Colordom
 
-Ruby gem to extract color palettes from images implemented in Rust. Rust must be available on your system to install this gem.
+Ruby gem to extract dominant colors from images using native extension implemented in Rust. Rust must be available on your system to install this gem.
 
 [![Gem Version](https://badge.fury.io/rb/colordom.svg)](https://badge.fury.io/rb/colordom)
 [![Build Status](https://travis-ci.org/hardpixel/colordom.svg?branch=master)](https://travis-ci.org/hardpixel/colordom)
-[![Maintainability](https://api.codeclimate.com/v1/badges/7e307214d3c2e4d2056d/maintainability)](https://codeclimate.com/github/hardpixel/colordom/maintainability)
+[![Maintainability](https://api.codeclimate.com/v1/badges/6040c6d79abf2d6e7efb/maintainability)](https://codeclimate.com/github/hardpixel/colordom/maintainability)
 
 ## Installation
 

data/bin/benchmark

@@ -7,10 +7,25 @@ require 'benchmark/memory'
 
 require 'colordom'
 require 'camalian'
+require 'colorscore'
+require 'miro'
 
 COUNT = 5
 IMAGE = File.join(__dir__, '..', 'samples/sample.png')
 
+def miro(method)
+  Miro.options[:color_count] = COUNT
+  Miro.options[:method] = method
+
+  colors = Miro::DominantColors.new(IMAGE)
+  colors.to_hex
+end
+
+def colorscore
+  histogram = Colorscore::Histogram.new(IMAGE, COUNT)
+  histogram.colors
+end
+
 def camalian(quant)
   img = Camalian::load(IMAGE)
   img.prominent_colors(COUNT, quantization: quant)
@@ -29,6 +44,18 @@ reports = lambda do |x|
     Colordom.kmeans(IMAGE, COUNT)
   end
 
+  x.report('colorscore (HST)') do
+    colorscore
+  end
+
+  x.report('miro (HST)') do
+    miro('histogram')
+  end
+
+  x.report('miro (PXG)') do
+    miro('pixel_group')
+  end
+
   x.report('camalian (HST)') do
     camalian(Camalian::QUANTIZATION_HISTOGRAM)
   end

data/bin/compare

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+
+require 'tempfile'
+require 'base64'
+
+require 'colordom'
+require 'camalian'
+require 'colorscore'
+require 'miro'
+
+COUNT = 6
+IMAGE = File.join(__dir__, '..', 'samples/compare.png')
+TEMPL = File.read File.join(__dir__, '..', 'samples/compare.svg')
+
+TEMPL.sub!('compare.png', "data:image/png;base64,#{Base64.strict_encode64(File.read(IMAGE))}")
+
+def replace(prefix, colors)
+  colors.each_with_index do |color, index|
+    TEMPL.sub!("{{#{prefix}-#{index}}}", color)
+  end
+end
+
+def miro(method, prefix)
+  Miro.options[:color_count] = COUNT
+  Miro.options[:method] = method
+
+  colors = Miro::DominantColors.new(IMAGE)
+  replace("miro-#{prefix}", colors.to_hex)
+end
+
+def colorscore(prefix)
+  histogram = Colorscore::Histogram.new(IMAGE, COUNT)
+  replace("colorscore-#{prefix}", histogram.colors.map(&:html))
+end
+
+def camalian(quant, prefix)
+  image  = Camalian::load(IMAGE)
+  colors = image.prominent_colors(COUNT, quantization: quant)
+
+  replace("camalian-#{prefix}", colors.map(&:to_hex))
+end
+
+def colordom(method, prefix)
+  colors = Colordom.send(method, IMAGE, COUNT)
+  replace("colordom-#{prefix}", colors.map(&:to_hex))
+end
+
+colordom(:histogram, 'hst')
+colordom(:mediancut, 'mcq')
+colordom(:kmeans, 'kms')
+
+camalian(Camalian::QUANTIZATION_HISTOGRAM, 'hst')
+camalian(Camalian::QUANTIZATION_MEDIAN_CUT, 'mcq')
+camalian(Camalian::QUANTIZATION_K_MEANS, 'kms')
+
+colorscore('hst')
+
+miro('histogram', 'hst')
+miro('pixel_group', 'pxg')
+
+tempfile = Tempfile.create(['colordom-compare', '.svg'])
+
+tempfile.write(TEMPL)
+tempfile.close
+
+system("xdg-open #{tempfile.path}")

data/colordom.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jonian Guveli']
   spec.email         = ['jonian@hardpixel.eu']
 
-  spec.summary       = %q{Ruby wrapper for dominant color utilities in Rust}
-  spec.description   = %q{This project is a wrapper for dominant color utilities implemented in Rust.}
+  spec.summary       = %q{Extract dominant colors from images}
+  spec.description   = %q{Extract dominant colors from images using native extension implemented in Rust.}
   spec.homepage      = 'https://github.com/hardpixel/colordom'
   spec.license       = 'MIT'
 

data/lib/colordom/color.rb

@@ -16,9 +16,7 @@ module Colordom
     end
 
     def hex
-      rgb.inject('#') do |str, val|
-        str + val.to_s(16).rjust(2, '0').upcase
-      end
+      '#%02X%02X%02X' % rgb
     end
 
     alias to_rgb rgb

data/lib/colordom/native.rb

@@ -9,7 +9,7 @@ module Colordom
 
     attach_function :to_histogram, :to_histogram, [:string], Result
     attach_function :to_mediancut, :to_mediancut, [:string, :uint8], Result
-    attach_function :to_kmeans, :to_kmeans, [:string, :uint8], Result
+    attach_function :to_kmeans, :to_kmeans, [:string, :uint], Result
 
     attach_function :free, :free_result, [Result], :void
   end

data/lib/colordom/version.rb

@@ -1,3 +1,3 @@
 module Colordom
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/src/lib.rs

@@ -23,7 +23,6 @@ pub extern "C" fn to_histogram(path: *const c_char) -> *mut c_char {
     Err(ex) => return to_char(format!("Colordom::Error {:?}", ex.to_string()))
   };
 
-
   let has_alpha = match img.color() {
     image::ColorType::Rgba8 => true,
     image::ColorType::Rgba16 => true,
@@ -48,7 +47,7 @@ pub extern "C" fn to_mediancut(path: *const c_char, max_colors: u8) -> *mut c_ch
   let result = palette_extract::get_palette_with_options(
     &pixels,
     PixelEncoding::Rgb,
-    Quality::default(),
+    Quality::new(6),
     MaxColors::new(max_colors),
     PixelFilter::None
   );
@@ -57,7 +56,7 @@ pub extern "C" fn to_mediancut(path: *const c_char, max_colors: u8) -> *mut c_ch
 }
 
 #[no_mangle]
-pub extern "C" fn to_kmeans(path: *const c_char, max_colors: u8) -> *mut c_char {
+pub extern "C" fn to_kmeans(path: *const c_char, max_colors: usize) -> *mut c_char {
   let img = match image::open(&to_string(path)) {
     Ok(res) => res,
     Err(ex) => return to_char(format!("Colordom::Error {:?}", ex.to_string()))
@@ -75,7 +74,7 @@ pub extern "C" fn to_kmeans(path: *const c_char, max_colors: u8) -> *mut c_char
     .collect();
 
   let run_result = kmeans_colors::get_kmeans_hamerly(
-    max_colors.into(),
+    max_colors,
     max_iterations,
     converge,
     verbose,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colordom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -80,8 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: This project is a wrapper for dominant color utilities implemented in
-  Rust.
+description: Extract dominant colors from images using native extension implemented
+  in Rust.
 email:
 - jonian@hardpixel.eu
 executables: []
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - bin/benchmark
+- bin/compare
 - bin/console
 - bin/setup
 - colordom.gemspec
@@ -130,5 +131,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Ruby wrapper for dominant color utilities in Rust
+summary: Extract dominant colors from images
 test_files: []