devil 0.1.9.0-x86-mswin32-60 → 0.1.9.1-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,26 @@
+2009-6-12 John Mair (Banisterfiend)
+* version 0.1.9.1
+* added thumbnail2 and resize2 for anti-aliased image scaling
+* made Gosu::Window#screenshot 1.9 compatible (now using glReadPixels)
+* using version.rb to help manage versions
+
+2009-14-11 John Mair (Banisterfiend)
+* added to ruby_il.c:
+* IL::SetInteger, IL::JPG_QUALITY
+* added to ruby_ilu.c:
+* ILU::CompareImage
+* added test_quality.rb to tests
+* added :jpg_quality option parameter to Devil::Image#save
+
+2009-11-11 John Mair (Banisterfiend)
+* version 0.1.9.0 re-release
+* REMOVED ILUT (OpenGL) support because ILUT is not built with OpenGL support on all platforms (e.g gentoo and some ubuntu distros)
+
+2009-11-10 John Mair (Banisterfiend)
+* version 0.1.9.0
+* added ILUT (OpenGL) support
+* updated installation info (no longer using c:\windows\system\ for dlls)
+
 2009-10-29 John Mair (Banisterfiend)
 * version 0.1.8.8
 * added Devil.with_group (for loading multiple images into the same block)

data/README

@@ -1,4 +1,4 @@
-Ruby Devil version 0.1.9.0
+Ruby Devil version 0.1.9.1
 ========================
 
 * Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
@@ -23,8 +23,8 @@ For Gentoo:
 
 For windows:
 
-* download devil.dll and ilu.dll from [http://github.com/banister/devil/downloads]
-* and copy these files to c:\windows\system\
+* download devil-dlls.zip from [http://github.com/banister/devil/downloads]
+* and copy the uncompressed files to c:\ruby\bin\
 
 For macosx:
 

data/Rakefile

@@ -8,8 +8,8 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-DEVIL_VERSION = "0.1.9.0"
-
+# get the devil version
+require 'lib/devil/version'
 dlext = Config::CONFIG['DLEXT']
 
 CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~", "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
     s.name = "devil"
     s.summary = "ruby bindings for devil cross platform image loading library"
     s.description = s.summary
-    s.version = DEVIL_VERSION
+    s.version = Devil::VERSION
     s.author = "Jaroslaw Tworek, John Mair (banisterfiend)"
     s.email = 'jrmair@gmail.com'
     s.date = Time.now.strftime '%Y-%m-%d'
@@ -39,7 +39,7 @@ spec = Gem::Specification.new do |s|
     s.has_rdoc = true
     s.extra_rdoc_files = ["README"]
     s.rdoc_options << '--main' << 'README'
-    s.files = ["Rakefile", "README", "CHANGELOG", "LICENSE", "lib/devil.rb", "lib/devil/gosu.rb"] +
+    s.files = ["Rakefile", "README", "CHANGELOG", "LICENSE", "lib/devil.rb", "lib/devil/gosu.rb", "lib/devil/version.rb"] +
         FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.png", "test/*.jpg"].to_a
 
     if RUBY_PLATFORM =~ /win32/
@@ -71,6 +71,6 @@ end
 
 Rake::RDocTask.new do |rd|
   rd.main = "README"
-  rd.rdoc_files.include("README", "lib/devil.rb", "lib/devil/gosu.rb")
+  rd.rdoc_files.include("README", "lib/devil.rb", "lib/devil/gosu.rb", "lib/devil/version.rb")
 end
 

data/ext/devil/extconf.rb

@@ -1,27 +1,23 @@
-require 'mkmf'
-
-if RUBY_PLATFORM =~ /mingw|win32/
-    $CFLAGS += ' -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include/'
-    $LDFLAGS += ' -L/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/lib/'
-    exit unless have_library("glut32")
-    exit unless have_library("DevIL")
-    
-elsif RUBY_PLATFORM =~ /darwin/
-
-    # this only works if you install devil via macports
-    $CFLAGS += ' -I/opt/local/include/ -I/System/Library/Frameworks/GLUT.framework/Headers'
-    $LDFLAGS += ' -L/opt/local/lib/ -framework GLUT'
-    exit unless have_library("IL")
-
-elsif RUBY_PLATFORM =~ /linux/
-    exit unless have_library("IL")
-
-    exit unless have_library("glut")
-    exit unless have_library("GL")
-end
-
-# all platforms
-exit unless have_library("ILU")
-exit unless have_library("ILUT")
-
-create_makefile('devil')
+require 'mkmf'
+
+if RUBY_PLATFORM =~ /mingw|win32/
+    $CFLAGS += ' -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include/'
+    $LDFLAGS += ' -L/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/lib/'
+    exit unless have_library("DevIL")
+    
+elsif RUBY_PLATFORM =~ /darwin/
+
+    # this only works if you install devil via macports
+    $CFLAGS += ' -I/opt/local/include/'
+    $LDFLAGS += ' -L/opt/local/lib/'
+    exit unless have_library("IL")
+
+elsif RUBY_PLATFORM =~ /linux/
+    exit unless have_library("IL")
+
+end
+
+# all platforms
+exit unless have_library("ILU")
+
+create_makefile('devil')

data/ext/devil/ruby_devil_ext.c

@@ -5,5 +5,5 @@ void
 Init_devil() {
     InitializeIL();
     InitializeILU();
-    InitializeILUT();
+    /* InitializeILUT(); */
 }

data/ext/devil/ruby_devil_ext.h

@@ -1,11 +1,8 @@
 #include <ruby.h>
-
 #include <stdio.h>
 
 typedef struct RArray RArray;
 
 extern void InitializeIL();
 extern void InitializeILU();
-
-/* turning off ILUT layer */
-/*extern void InitializeILUT(); */
+/* extern void InitializeILUT();  */

data/ext/devil/ruby_il.c

@@ -376,6 +376,17 @@ static VALUE il_ClearImage(VALUE obj)
     ILboolean flag = ilClearImage();
     return flag ? Qtrue : Qfalse;
 }
+
+static VALUE il_SetInteger(VALUE obj, VALUE rb_mode, VALUE rb_param)
+{
+    ILenum mode = NUM2INT(rb_mode);
+    ILint param = NUM2INT(rb_param);
+
+    ilSetInteger(mode, param);
+
+    return Qnil;
+}
+
 /* end of banisterfiend additions */
 
 void
@@ -422,6 +433,7 @@ InitializeIL() {
     rb_define_module_function(mIL, "ClearColour", il_ClearColour, 4);
     rb_define_module_function(mIL, "ClearImage", il_ClearImage, 0);
     rb_define_module_function(mIL, "ApplyProfile", il_ApplyProfile, 2);
+    rb_define_module_function(mIL, "SetInteger", il_SetInteger, 2);
     /* end of methods added by banisterfiend */
     
     //////////////////////////////////
@@ -526,6 +538,7 @@ InitializeIL() {
     rb_define_const(mIL, "CUR_IMAGE", INT2NUM(IL_CUR_IMAGE));
     rb_define_const(mIL, "ORIGIN_LOWER_LEFT", INT2NUM(IL_ORIGIN_LOWER_LEFT));
     rb_define_const(mIL, "ORIGIN_UPPER_LEFT", INT2NUM(IL_ORIGIN_UPPER_LEFT));
+    rb_define_const(mIL, "JPG_QUALITY", INT2NUM(IL_JPG_QUALITY));
 }
 //////////////////////////////////////////
 

data/ext/devil/ruby_ilu.c

@@ -163,6 +163,14 @@ static VALUE ilu_SwapColours(VALUE obj)
     return flag ? Qtrue : Qfalse;    
 }
 
+static VALUE ilu_CompareImage(VALUE obj, VALUE rb_cmp_img)
+{
+    ILuint cmp_img = NUM2INT(rb_cmp_img);
+    
+    ILboolean flag = iluCompareImage(rb_cmp_img);
+
+    return flag ? Qtrue : Qfalse;
+}
 /* end of functions added by banisterfiend */
 
 void
@@ -194,6 +202,7 @@ InitializeILU() {
     rb_define_module_function(mILU, "Emboss", ilu_Emboss, 0);
     rb_define_module_function(mILU, "Mirror", ilu_Mirror, 0);
     rb_define_module_function(mILU, "SwapColours", ilu_SwapColours, 0);
+    rb_define_module_function(mILU, "CompareImage", ilu_CompareImage, 1);
     /* end of functions added by banisterfiend */
 
     /* constants added by banisterfiend */

data/lib/devil.rb

@@ -4,6 +4,7 @@ require 'rbconfig'
 
 direc = File.dirname(__FILE__)
 dlext = Config::CONFIG['DLEXT']
+
 begin
     if RUBY_VERSION && RUBY_VERSION =~ /1.9/
         require "#{direc}/1.9/devil.#{dlext}"
@@ -13,14 +14,13 @@ begin
 rescue LoadError => e
     require "#{direc}/devil.#{dlext}"
 end
+require "#{direc}/devil/version"
 
 # Provides a high level wrapper for the low-level DevIL Ruby bindings
 module Devil
     include IL
     include ILU
 
-    VERSION = '0.1.9.0'
-    
     class << self
 
         # loads +file+ and returns a new image
@@ -142,6 +142,7 @@ module Devil
             # update the config. options 
             ILU.ImageParameter(ILU::FILTER, @options[:scale_filter])
             ILU.ImageParameter(ILU::PLACEMENT, @options[:placement])
+            IL.SetInteger(IL::JPG_QUALITY, @options[:jpg_quality])
             IL.ClearColour(*@options[:clear_color])
         end
 
@@ -171,11 +172,13 @@ module Devil
                 :prepare_image_hook => nil,
                 :load_image_hook => nil,
                 :create_image_hook => nil,
+                :jpg_quality => 99
             }
             
             # configurable options
             ILU.ImageParameter(ILU::FILTER, @options[:scale_filter])
             ILU.ImageParameter(ILU::PLACEMENT, @options[:placement])
+            IL.SetInteger(IL::JPG_QUALITY, @options[:jpg_quality])
             IL.ClearColour(*@options[:clear_color])
 
             # fixed options
@@ -250,7 +253,7 @@ class Devil::Image
 
     alias_method :close, :free
     alias_method :delete, :free
-    
+
     # returns the width of the image.
     def width
         action { IL.GetInteger(IL::IMAGE_WIDTH) }
@@ -266,10 +269,18 @@ class Devil::Image
     alias_method :rows, :height
 
     # saves the image to +file+. If no +file+ is provided default to the opened file.
-    def save(file = @file)
+    # Optional :quality hash parameter (only applies to JPEG images).
+    # Valid values are in the 0-99 range, with 99 being the best quality.
+    def save(file = @file, options = {})
+        quality = options[:quality]
+        
         raise "This image does not have an associated file. Please provide an explicit file name when saving." if !file
         
-        action { IL.SaveImage(file) }
+        action do
+            IL.SetInteger(IL::JPG_QUALITY, quality) if quality
+            IL.SaveImage(file)
+            IL.SetInteger(IL::JPG_QUALITY, Devil.get_options[:jpg_quality]) if quality
+        end
         self
     end
     
@@ -288,9 +299,22 @@ class Devil::Image
         self
     end
 
+    # resize the image to +width+ and +height+. Aspect ratios of the image do not have to be the same.
+    # Applies a gaussian filter before rescaling to reduce aliasing.
+    # Optional :filter hash parameter that maps to a valid scale filter
+    # Optional :gauss parameter - number of times to apply gaussian filter before resizing (default is 2)
+    # (see: Devil.set_options :scale_filter)
+    def resize2(width, height, options = {})
+        gauss = options[:gauss] ||= 2
+        blur(gauss) if (width < self.width && height < self.height)
+        resize(width, height, options)
+        self
+    end
+
     # Creates a proportional thumbnail of the image scaled so its longest
     # edge is resized to +size+.
     # Optional :filter hash parameter that maps to a valid scale filter
+    # Optional :gauss parameter - number of times to apply gaussian filter before resizing (default is 2)
     # (see: Devil.set_options :scale_filter)
     def thumbnail(size, options = {})
 
@@ -301,6 +325,18 @@ class Devil::Image
         self
     end
 
+    # Creates a proportional thumbnail of the image scaled so its longest
+    # edge is resized to +size+.
+    # Applies a gaussian filter before rescaling to reduce aliasing.
+    # Optional :filter hash parameter that maps to a valid scale filter
+    # (see: Devil.set_options :scale_filter)
+    def thumbnail2(size, options = {})
+        gauss = options[:gauss] ||= 2
+        blur(gauss)
+        thumbnail(size, options)
+        self
+    end
+
     # return a deep copy of the current image.
     def dup
         new_image_name = action { IL.CloneCurImage }

data/lib/devil/gosu.rb

@@ -37,19 +37,9 @@ class Gosu::Window
     def screenshot
         require 'opengl'
 
-        canvas_texture_id = glGenTextures(1).first
-        
         img = nil
         self.gl do
-            glEnable(GL_TEXTURE_2D)
-            glBindTexture(GL_TEXTURE_2D, canvas_texture_id)
-            
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, self.width, self.height, 0,
-                         GL_RGB, GL_UNSIGNED_BYTE, "\0" * self.width * self.height * 3)
-            
-            glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, self.width, self.height, 0)
-
-            data = glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE)
+            data = glReadPixels(0, 0, self.width, self.height, GL_RGBA, GL_UNSIGNED_BYTE)
             img = Devil.from_blob(data, self.width, self.height)
         end
         

data/lib/devil/version.rb

@@ -0,0 +1,3 @@
+module Devil
+    VERSION = "0.1.9.1"
+end

data/test/test_gosu_show.rb

@@ -5,6 +5,6 @@ $LOAD_PATH.push("#{$direc}/../lib/")
 require 'rubygems'
 require 'devil/gosu'
 
-Devil.load_image("texture.png").show(512, 400)
+Devil.load_image("texture.png").emboss.show(512, 400)
 Devil.load_image("tank.png").show(300, 400)
 

data/test/test_quality.rb

@@ -0,0 +1,9 @@
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'devil/gosu'
+
+Devil.load("texture.png").save("texture_out1.jpg", :quality => 50).
+    save("texture_out2.jpg").free

data/test/test_thumbnail.rb

@@ -6,7 +6,8 @@ require 'rubygems'
 require 'devil/gosu'
 
 Devil.load("texture.png") do |img|
-    img.dup.thumbnail(100, :filter => Devil::NEAREST).show(200, 300).free
-    img.dup.thumbnail(100).show(200, 500).free
+    img.dup.thumbnail2(100, :filter => Devil::NEAREST, :gauss => 4).show(200, 300).free
+    img.dup.thumbnail2(100, :filter => Devil::NEAREST, :gauss => 1).show(500, 300).free
+    img.dup.thumbnail(100).save("thumb.png").show(200, 500).free
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devil
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.0
+  version: 0.1.9.1
 platform: x86-mswin32-60
 authors: 
 - Jaroslaw Tworek, John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 +13:00
+date: 2009-12-07 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -28,12 +28,12 @@ files:
 - LICENSE
 - lib/devil.rb
 - lib/devil/gosu.rb
+- lib/devil/version.rb
 - ext/devil/extconf.rb
 - ext/devil/ruby_devil_ext.h
 - ext/devil/ruby_devil_ext.c
 - ext/devil/ruby_il.c
 - ext/devil/ruby_ilu.c
-- ext/devil/ruby_ilut.c
 - test/test_blank.rb
 - test/test_blit.rb
 - test/test_clone_and_crop.rb
@@ -45,6 +45,7 @@ files:
 - test/test_ilut.rb
 - test/test_new_api.rb
 - test/test_profile.rb
+- test/test_quality.rb
 - test/test_scale_algos.rb
 - test/test_screenshot.rb
 - test/test_thumbnail.rb

data/ext/devil/ruby_ilut.c

@@ -1,98 +0,0 @@
-#include <ruby.h>
-#include <IL/ilut.h>
-#include "ruby_devil_ext.h"
-
-static VALUE mILUT;
-
-static VALUE ilut_Renderer(VALUE obj, VALUE ilut_enum) {
-    ILenum renderer = NUM2INT(ilut_enum);
-    ilutRenderer(renderer);
-    return Qnil;
-}
-
-static VALUE ilut_Enable(VALUE obj, VALUE rb_Mode) {
-    ILenum Mode = NUM2INT(rb_Mode);
-    ILboolean flag = ilutEnable(Mode);
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLTexImage(VALUE obj, VALUE rb_Level) {
-    GLuint Level = NUM2INT(rb_Level);
-    ILboolean flag = ilutGLTexImage(Level);
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLBindTexImage(VALUE obj) {
-    GLuint ret = ilutGLBindTexImage();
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLBuildMipmaps(VALUE obj) {
-    ILboolean flag = ilutGLBuildMipmaps();
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLBindMipmaps(VALUE obj) {
-    ILuint ret = ilutGLBindMipmaps();
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLLoadImage(VALUE obj, VALUE rb_FileName) {
-    const ILstring FileName = StringValuePtr(rb_FileName);
-    ILuint ret = ilutGLLoadImage(FileName);
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLScreen(VALUE obj) {
-    ILboolean flag = ilutGLScreen();
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLScreenie(VALUE obj) {
-    ILboolean flag = ilutGLScreenie();
-    return flag ? Qtrue : Qfalse;
-}
-
-
-
-void 
-InitializeILUT() {
-    mILUT = rb_define_module("ILUT");
-    //////////////////////////////////
-    //METHODS
-    //////////////////////////////////
-    rb_define_module_function(mILUT, "Renderer", ilut_Renderer, 1);
-    rb_define_module_function(mILUT, "Enable", ilut_Enable , 1);
-    rb_define_module_function(mILUT, "GLTexImage", ilut_GLTexImage, 1);
-    rb_define_module_function(mILUT, "GLBindTexImage", ilut_GLBindTexImage, 0);
-    rb_define_module_function(mILUT, "GLBuildMipmaps", ilut_GLBuildMipmaps , 0);
-    rb_define_module_function(mILUT, "GLBindMipmaps", ilut_GLBindMipmaps , 0);
-    rb_define_module_function(mILUT, "GLLoadImage", ilut_GLLoadImage, 1);
-    rb_define_module_function(mILUT, "GLScreen", ilut_GLScreen , 1);
-    rb_define_module_function(mILUT, "GLScreenie", ilut_GLScreenie , 1);
-
-    //////////////////////////////////
-    //CONSTANTS
-    //////////////////////////////////
-    rb_define_const(mILUT, "OPENGL", INT2NUM(ILUT_OPENGL));
-    rb_define_const(mILUT, "ALLEGRO", INT2NUM(ILUT_ALLEGRO));
-    rb_define_const(mILUT, "WIN32", INT2NUM(ILUT_WIN32));
-    rb_define_const(mILUT, "DIRECT3D8", INT2NUM(ILUT_DIRECT3D8));
-    rb_define_const(mILUT, "DIRECT3D9", INT2NUM(ILUT_DIRECT3D9));
-
-    rb_define_const(mILUT, "PALETTE_MODE", INT2NUM(ILUT_PALETTE_MODE));
-    rb_define_const(mILUT, "OPENGL_CONV", INT2NUM(ILUT_OPENGL_CONV));
-    rb_define_const(mILUT, "D3D_MIPLEVELS", INT2NUM(ILUT_D3D_MIPLEVELS));
-    rb_define_const(mILUT, "MAXTEX_WIDTH", INT2NUM(ILUT_MAXTEX_WIDTH));
-    rb_define_const(mILUT, "MAXTEX_HEIGHT", INT2NUM(ILUT_MAXTEX_HEIGHT));
-    rb_define_const(mILUT, "MAXTEX_DEPTH", INT2NUM(ILUT_MAXTEX_DEPTH));
-    rb_define_const(mILUT, "GL_USE_S3TC", INT2NUM(ILUT_GL_USE_S3TC));
-    rb_define_const(mILUT, "D3D_USE_DXTC", INT2NUM(ILUT_D3D_USE_DXTC));
-    rb_define_const(mILUT, "GL_GEN_S3TC", INT2NUM(ILUT_GL_GEN_S3TC));
-    rb_define_const(mILUT, "D3D_GEN_DXTC", INT2NUM(ILUT_D3D_GEN_DXTC));
-    rb_define_const(mILUT, "S3TC_FORMAT", INT2NUM(ILUT_S3TC_FORMAT));
-    rb_define_const(mILUT, "DXTC_FORMAT", INT2NUM(ILUT_DXTC_FORMAT));
-    rb_define_const(mILUT, "D3D_POOL", INT2NUM(ILUT_D3D_POOL));
-    rb_define_const(mILUT, "D3D_ALPHA_KEY_COLOR", INT2NUM(ILUT_D3D_ALPHA_KEY_COLOR));
-    rb_define_const(mILUT, "D3D_ALPHA_KEY_COLOUR", INT2NUM(ILUT_D3D_ALPHA_KEY_COLOUR));
-}