pikl 0.1.0 → 0.2.0

data/History.txt

@@ -1,4 +1,5 @@
-== 0.1.0 2008-04-08
+== 0.2.0
+* Supports method chain.
 
-* 1 major enhancement:
-  * Initial release
+== 0.1.0
+* First release!

data/Manifest.txt

@@ -29,9 +29,9 @@ lib/pikl/const.rb
 lib/pikl/errors.rb
 lib/pikl/ext.rb
 lib/pikl/image.rb
+lib/pikl/pikl.dll
 lib/pikl/version.rb
 setup.rb
 test/sample.jpg
 test/test_helper.rb
-test/test_pikl.rb
 test/test_pikl_image.rb

data/README.txt

@@ -1,21 +1,33 @@
 = pikl
 
-Pikl is an image librarry. This library aims to process the image easily.
+Pikl is an image librarry for ruby. This library aims easily image processing. Supports JPEG, PNG and BITMAP.
 
 === Installation of pikl
 
 The simplest way is to install the gem:
 
   $ sudo gem install pikl
+  
+To use option for libjpeg and libpng directories:
+
+  $ sudo gem install pikl -- --with-opt-dir=path/to/libraries
 
 == SYNOPSIS:
 
+Basic use of pikl:
   require "pikl"
   Pikl::Image.open('path/to/image.jpg') do |img|
     img.trim(10,5,-10,-5)
     img.save('path/to/output.png', :png)
   end
 
+Use method chain for processing image:
+  require "pikl"
+  Pikl::Image.open('path/to/image.jpg') do |img|
+    img.resize(120,:auto).rotate(90).save('path/to/output.png')
+  end
+
+
 == REQUIREMENTS:
 
 Currently, pikl-core (implemented with C) depends on the following libraries:
@@ -23,14 +35,14 @@ Currently, pikl-core (implemented with C) depends on the following libraries:
 * libjpeg
 * libpng
 
-notice: pikl use binary library on windows. so these libraries aren't necessary.
+notice: pikl use binary library on windows. so these libraries aren't necessary on windows.
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 pikl Ryota Maruko
-Copyright (c) 2008 libpikl Keiko Soejima
+Copyright (c) 2008 pikl.rb Ryota Maruko
+Copyright (c) 2008 pikl.so Keiko Soejima
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,4 +1,4 @@
+PACKAGE_PLATFORM = (ARGV[0] =~ /mswin32$/) ? 'mswin32' : RUBY_PLATFORM
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
-
 Dir['tasks/**/*.rake'].each { |rake| load rake }

data/config/hoe.rb

@@ -1,8 +1,8 @@
 require 'pikl/version'
 
 AUTHOR = 'Ryota Maruko'  # can also be an array of Authors
-EMAIL = "FIXME email"
-DESCRIPTION = "Simple Image Lib."
+EMAIL = ""
+DESCRIPTION = "Pikl is an image librarry for ruby. This library aims easily image processing. Supports JPEG, PNG and BITMAP."
 GEM_NAME = 'pikl' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'pikl' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
@@ -27,7 +27,6 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
   RUBYFORGE_USERNAME.replace @config["username"]
 end
 
-
 REV = nil 
 # UNCOMMENT IF REQUIRED: 
 # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
@@ -59,11 +58,8 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  p.spec_extras = {
-    :extensions => ['ext/pikl/extconf.rb'],
-  }    # A hash of extra values to set in the gemspec.
-  
+  p.spec_extras = (PACKAGE_PLATFORM =~ /mswin32/) ? {} : { :extensions => ['ext/pikl/extconf.rb'] }
+   # A hash of extra values to set in the gemspec.
 end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")

data/ext/pikl/extconf.rb

@@ -6,11 +6,12 @@
     --with-png-include=dir
     --with-png-lib=dir
 =end
+
 require 'mkmf'
+require 'rbconfig'
 
 dir_config('jpeg')
 dir_config('png')
-if have_header('jpeglib.h') and have_library('jpeg') and have_header('png.h') and have_library('png')
+if have_header('jpeglib.h') && have_library('jpeg') && have_header('png.h') && have_library('png')
   create_makefile('pikl/pikl')
 end
-

data/ext/pikl/pikl.h

@@ -124,7 +124,7 @@ PKLExport int pkl_height(PKLImage pkl);
 PKLExport int pkl_trim(PKLImage pkl, int sx, int sy, int width, int height);
 
 /*!
-	右回り90度単位で回転します。<br>
+	左回り90度単位で回転します。<br>
 	@param pkl [in] PKLImageオブジェクト
 	@param angle [in] 回転角度(PKL_ANGLE参照)
 	@return 成功した場合は0。失敗した場合は真を返します。

data/ext/pikl/pikl_effect.h

@@ -12,10 +12,6 @@
 //unsharp target pixel
 #define RADIUS 1
 
-#ifndef M_PI
-	#define M_PI 3.14159265358979323846
-#endif
-
 typedef struct {
 	int max, min;
 	long data[PKL_COLOR];

data/ext/pikl/pikl_private.h

@@ -5,7 +5,9 @@
 #define PKL_RGB(v) v<0?0:v>255?255:v
 #define PKL_CHANNEL 4
 #define PKL_COLOR 256
-
+#ifndef M_PI
+	#define M_PI 3.14159265358979323846
+#endif
 //=============================================================================
 // PKLImage
 //=============================================================================

data/ext/pikl/pikl_rotate.c

@@ -15,14 +15,14 @@ PKLExport int pkl_rotate(PKLImage pkl, PKL_ANGLE angle)
 		case PKL_ANGLE_000:
 			return(0);
 		case PKL_ANGLE_090:
-			rcos   =  0;
-			rsin   = -1;
+			rcos   = 0;
+			rsin   = 1;
 			width  = pkl->height;
 			height = pkl->width;
-			sx     = -(pkl->height-1);
-			sy     = 0;
-			ex     = 0;
-			ey     = pkl->width-1;
+			sx     = 0;
+			sy     = -(pkl->width-1);
+			ex     = pkl->height-1;
+			ey     = 0;
 			break;
 		case PKL_ANGLE_180:
 			rcos   = -1;
@@ -35,14 +35,14 @@ PKLExport int pkl_rotate(PKLImage pkl, PKL_ANGLE angle)
 			ey     = 0;
 			break;
 		case PKL_ANGLE_270:
-			rcos   = 0;
-			rsin   = 1;
+			rcos   =  0;
+			rsin   = -1;
 			width  = pkl->height;
 			height = pkl->width;
-			sx     = 0;
-			sy     = -(pkl->width-1);
-			ex     = pkl->height-1;
-			ey     = 0;
+			sx     = -(pkl->height-1);
+			sy     = 0;
+			ex     = 0;
+			ey     = pkl->width-1;
 			break;
 		default:
 			return(1);

data/lib/pikl/const.rb

@@ -12,17 +12,22 @@ module Pikl
   ANGLE270 = 3
 
 	SAMPLE_NN	= 1  #nearest neighbor
-	SAMPLE_BC	= 2  #bicubic(4points)
-	SAMPLE_BC2 = 3 #bicubic(16points)
+	SAMPLE_BL	= 2  #bilinear
+	SAMPLE_BC = 3  #bicubic
 	SAMPLE_PA	= 4  #pixcel average(reduce only)
 	SAMPLE_LZ	= 5  #lanczos
-	
+
 	SAMPLES = {
 	  :nearest_neighbor => SAMPLE_NN,
+	  :bilinear => SAMPLE_BL,
 	  :bicubic => SAMPLE_BC,
-	  :bicubic2 => SAMPLE_BC2,
 	  :pixcel_averate => SAMPLE_PA,
-	  :lanczoz => SAMPLE_LZ,
+	  :lanczos => SAMPLE_LZ,
+	  :nn => SAMPLE_NN,
+	  :bl => SAMPLE_BL,
+	  :bc => SAMPLE_BC,
+	  :pa => SAMPLE_PA,
+	  :lz => SAMPLE_LZ,
 	}
   
   ROTATE_ANGLE = {

data/lib/pikl/ext.rb

@@ -5,7 +5,9 @@ module Pikl
   
   module Ext
     extend DL::Importable
-    dlload "#{File.dirname(__FILE__)}/pikl.#{RbConfig::CONFIG['DLEXT']}"
+
+    dlext = (RbConfig::CONFIG["host_os"] == 'mswin32') ? 'dll' : RbConfig::CONFIG['DLEXT']
+    dlload "#{File.dirname(__FILE__)}/pikl.#{dlext}"
 
     typealias("KKImage", "void")
     typealias("PKL_FORMAT", "int")
@@ -28,5 +30,6 @@ module Pikl
     extern "int pkl_brightness(PKLImage*, int)"
     extern "int pkl_hls(PKLImage*, double, double, double)"
     extern "int pkl_gamma(PKLImage*, double)"
+
   end
 end

data/lib/pikl/image.rb

@@ -22,7 +22,7 @@ module Pikl
 
     def save(outpath, format = nil, compress = nil)
       raise Pikl::ImageProcessException.new("image already closed.") unless @pkl_image
-      format ||= @format ||= split_extensions(outpath)
+      format ||= (split_extensions(outpath) || @format)
       validate_format(format)
       if compress
         validate_compress(compress)
@@ -30,6 +30,7 @@ module Pikl
       end
       Ext.pkl_save(@pkl_image, File.expand_path(outpath), EXTENSIONS_FORMATS[format.to_s] || format.to_i)
       self.close unless(@block)
+      @pkl_image
     end
     
     def close()
@@ -55,6 +56,8 @@ module Pikl
       dist_y = trim_dist(y, self.height, dist_y)
             
       Ext.pkl_trim(@pkl_image, x, y, dist_x, dist_y)
+      
+      self
     end
     
     def trim_dist(start, dist_from, dist_to)
@@ -70,9 +73,10 @@ module Pikl
     def rotate(angle)
       validate_rotate(angle)
       Ext.pkl_rotate(@pkl_image, ROTATE_ANGLE[angle.to_i])
+      self
     end
 
-    def resize(width, height, sample = :nearest_neighbor)
+    def resize(width, height, sample = :pixcel_averate)
       validate_auto(width,height)
 
       case sample.class.name
@@ -86,6 +90,7 @@ module Pikl
       validate_resize(width, height)
 
       Ext.pkl_resize(@pkl_image, width, height, sample)
+      self
     end
 
     # threshold=0-255
@@ -101,6 +106,7 @@ module Pikl
     # 	※画質によりこの通りではありません。-10..10の範囲より小さくなる可能性があります。
     def unshapmask(threshold, edge)
       Ext.pkl_unsharp(@pkl_image, threshold.to_i, edge.to_f)
+      self
     end
 
     # コントラスト調整
@@ -114,6 +120,7 @@ module Pikl
     # 		* rateが0未満の時は直線的に平坦化されます
     def contrast(rate)
       Ext.pkl_contrast(@pkl_image, rate.to_f)
+      self
     end
 
     # レベル補正
@@ -123,6 +130,7 @@ module Pikl
     # 	high = 全ピクセル数に対して、切り捨てる明るい色の総数の割合(0-100%)
     def level(low, high, coeff)
       Ext.pkl_level(@pkl_image, low.to_f, high.to_f, coeff.to_f)
+      self
     end
 
     # 明るさ調整
@@ -131,6 +139,7 @@ module Pikl
     # colorに-255を指定すると、ただの黒い画像になります。
     def brightness(color)
       Ext.pkl_brightness(@pkl_image, color.to_i)
+      self
     end
     
     # 輝度(明るさ)・彩度(鮮やかさ)・色相(色合い)調整
@@ -140,6 +149,7 @@ module Pikl
     #   hd(色相) 360.0度回転(R=113.2/Ye=173.0/G=225.0/Cy=293.2/B=353.0/Mg=45.0).360の倍数では変化なし
     def hls(ym, sm ,hd)
       Ext.pkl_hls(@pkl_image, ym.to_f, sm.to_f, hd.to_f)
+      self
     end
     
     # ガンマ補正
@@ -150,6 +160,7 @@ module Pikl
     #   1.0を指定した時は調整されません。    
     def gamma(gm)
       Ext.pkl_gamma(@pkl_image, gm.to_f)
+      self
     end
     
     # regular expressions to try for identifying extensions

data/lib/pikl/version.rb

@@ -1,7 +1,7 @@
 module Pikl #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/test_pikl_image.rb

@@ -5,8 +5,8 @@ class TestPiklImage < Test::Unit::TestCase
   SAMPLE_IMAGE = File.dirname(__FILE__) + '/sample.jpg'
   SAMPLE_OUTPUT = File.dirname(__FILE__) + '/output.jpg'
   
-  SAMPLE_IMAGE_W = 768
-  SAMPLE_IMAGE_H = 1024
+  SAMPLE_IMAGE_W = 120
+  SAMPLE_IMAGE_H = 160
 
   def setup
     
@@ -258,5 +258,11 @@ class TestPiklImage < Test::Unit::TestCase
         img.save(SAMPLE_OUTPUT,Pikl::JPEG,5)
       end
     end
+    
+    def test_method_chain
+      Pikl::Image.open(SAMPLE_IMAGE) do |img|
+        img.trim(5,10,:auto,:auto).rotate(90).resize(50,:auto).unshapmask(10,3).contrast(10).level(5,5,1.2).brightness(10).hls(0.1,0.1,355).gamma(1.2).save(SAMPLE_OUTPUT)
+      end
+    end
 
 end

metadata

@@ -1,35 +1,30 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: pikl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-05-01 00:00:00 +09:00
-summary: Simple Image Lib.
-require_paths: 
-- lib
-- ext
-email: 
-- FIXME email
-homepage: http://pikl.rubyforge.org
-rubyforge_project: pikl
-description: Simple Image Lib.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ryota Maruko
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-02 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: Pikl is an image librarry for ruby. This library aims easily image processing. Supports JPEG, PNG and BITMAP.
+email: 
+- ""
+executables: []
+
+extensions: 
+- ext/pikl/extconf.rb
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - License.txt
@@ -62,29 +57,40 @@ files:
 - lib/pikl/errors.rb
 - lib/pikl/ext.rb
 - lib/pikl/image.rb
+- lib/pikl/pikl.dll
 - lib/pikl/version.rb
 - setup.rb
 - test/sample.jpg
 - test/test_helper.rb
-- test/test_pikl.rb
-- test/test_pikl_image.rb
-test_files: 
-- test/test_helper.rb
-- test/test_pikl.rb
 - test/test_pikl_image.rb
+has_rdoc: true
+homepage: http://pikl.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: 
-- ext/pikl/extconf.rb
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: pikl
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Pikl is an image librarry for ruby. This library aims easily image processing. Supports JPEG, PNG and BITMAP.
+test_files: 
+- test/test_helper.rb
+- test/test_pikl_image.rb

data/test/test_pikl.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestPikl < Test::Unit::TestCase
-
-  def setup
-
-  end
-  
-  def test_truth
-    assert_equal(true, true)
-  end
-
-end