devil 0.1.7-x86-mswin32-60 → 0.1.8-x86-mswin32-60

data/CHANGELOG

@@ -0,0 +1,50 @@
+2009-10-21
+version 0.1.8
+* made LANCZOS3 scaling filter the default for highquality thumbnails
+* changed clear color to DevIL default (mother of pearl and full alpha)
+* added blit function to HLA (high level API)
+* added mirror, edge_detect, emboss, enlarge_canvas, etc to HLA
+* added ILU_CENTER, ILU_LOWER_LEFT, ILU_PLACEMENT etc to LLA
+* include ILU and IL modules in Devil::Image now
+* made Devil::Image#show return self
+* made Devil::Image#show use a dup of the image (so a 'snapshot' is taken of image)
+* added Devil.set_options method to HLA
+* refactored HLA to use an 'action' method, saved code duplication of set_binding/error_check etc.
+
+2009-10-17 John Mair (Banisterfiend)
+* ruby_il.c added:
+* constants: IMAGE_DEPTH, ORIGIN_SET, CONV_PAL, CUR_IMAGE, ORIGIN_LOWER_LEFT, ORIGIN_LOWER_RIGHT
+* methods: Disable, OriginFunc, ClearColour, ClearImage.
+* Modified FromBlob method to restore old binding after use.
+* ruby_ilu.c added:
+* methods: EnlargeCanvas, EdgeDetectP, EdgeDetectS, Emboss, Mirror, SwapColours.
+* Modified Crop to now take z-axis parameters. (stick to original API as closely as possible)
+
+2009-10-15 John Mair (Banisterfiend)
+* hopefully fixed compile errors on SnowLeopard!
+* added error checking to Devil::load_image()
+* added monkeypatch to Gosu::Image::new() to transparently load multiple formats
+* updated some rdoc
+
+2009-10-13 John Mair (Banisterfiend)
+* version 0.1.6
+* added Gosu and TexPlay interoperability
+* ...bunch of other miscellaneous functionality
+* released gem
+
+2009-10-10 John Mair (Banisterfiend)
+* constants added to ruby_il.c:
+* IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_FORMAT, FILE_OVERWRITE
+* functions added to ruby_il.c:
+* ilEnable, ilGetInteger, ilConvertImage, ToBlob, ilCloneCurImage
+* conditional compilation added to ruby_il.c for LBM constant
+* functions added to ruby_ilu.c:
+* ilFlipImage, ilRotate, ilCrop
+* added Gosu and TexPlay interoperability
+* ...bunch of other miscellaneous functionality
+
+2009-10-06 John Mair (Banisterfiend)
+* ruby 1.9 compatibility
+
+2006-09-28 Jaroslaw Tworek <dev.jrx@gmail.com>
+* Initial release

data/README

@@ -1,52 +1,52 @@
-Ruby Devil version 0.1.7
-========================
-
-* Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
-* Current maintainer: John Mair (banisterfiend) [http://banisterfiend.wordpress.com]
-
-Ruby bindings for the Developer's Image Library
-You need DevIL installed to use this extension
-
-The Ruby Devil Project page is here: [http://github.com/banister/devil]
-
-
-Installation Instructions:
-==========================
-
-For debian:
-
-* install the libdevil and libdevil-dev packages
-
-For Gentoo:
-
-* emerge "media-libs/devil"
-
-For windows:
-
-* download devil.dll and ilu.dll from [http://github.com/banister/devil/downloads]
-* and copy these files to c:\windows\system\
-
-For macosx:
-
-* sudo port install libdevil
-
-For other systems:
-
-* install libdevil and lib-devil-dev using your package manager
-* OR download and install the libraries from [http://openil.sourceforge.net]
-
-After you've installed the DevIL libraries you install the gem by going:
-
-* gem install devil
-
-If you wish to use the Gosu and TexPlay extensions, it is necessary to also have:
-
-* the Gosu gem (gem install gosu)
-* the TexPlay gem (gem install texplay)
-* ruby-opengl (gem install ruby-opengl)
-
-For now, there is support for just a subset of DevIL functions, but it is enough
-for 95% things you may want to do.
-
-For example uses, see test/ directory
-(note: that many of the examples use the Gosu library...this is often just for visualization purposes. Alot of the functionality does not depend on Gosu being present)
+Ruby Devil version 0.1.8
+========================
+
+* Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
+* Current maintainer: John Mair (banisterfiend) [http://banisterfiend.wordpress.com]
+
+Ruby bindings for the Developer's Image Library
+You need DevIL installed to use this extension
+
+The Ruby Devil Project page is here: [http://github.com/banister/devil]
+
+
+Installation Instructions:
+==========================
+
+For debian:
+
+* install the libdevil and libdevil-dev packages
+
+For Gentoo:
+
+* emerge "media-libs/devil"
+
+For windows:
+
+* download devil.dll and ilu.dll from [http://github.com/banister/devil/downloads]
+* and copy these files to c:\windows\system\
+
+For macosx:
+
+* sudo port install libdevil
+
+For other systems:
+
+* install libdevil and lib-devil-dev using your package manager
+* OR download and install the libraries from [http://openil.sourceforge.net]
+
+After you've installed the DevIL libraries you install the gem by going:
+
+* gem install devil
+
+If you wish to use the Gosu and TexPlay extensions, it is necessary to also have:
+
+* the Gosu gem (gem install gosu)
+* the TexPlay gem (gem install texplay)
+* ruby-opengl (gem install ruby-opengl)
+
+For now, there is support for just a subset of DevIL functions, but it is enough
+for 95% things you may want to do.
+
+For example uses, see test/ directory
+(note: that many of the examples use the Gosu library...this is often just for visualization purposes. Alot of the functionality does not depend on Gosu being present)

data/Rakefile

@@ -1,75 +1,76 @@
-require 'rake/clean'
-if RUBY_PLATFORM !~ /win32/
-    require 'rake/extensiontask'
-end
-
-require 'rake/gempackagetask'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-DEVIL_VERSION = "0.1.7"
-
-dlext = Config::CONFIG['DLEXT']
-
-CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~", "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
-CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o", "doc/**")
-
-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.author = "Jaroslaw Tworek, John Mair (banisterfiend)"
-    s.email = 'jrmair@gmail.com'
-    s.date = Time.now.strftime '%Y-%m-%d'
-    s.require_path = 'lib'
-    s.homepage = "http://banisterfiend.wordpress.com"
-
-    if RUBY_PLATFORM =~ /win32/
-        s.platform = Gem::Platform::CURRENT
-    else
-        s.platform = Gem::Platform::RUBY
-    end
-
-    if RUBY_PLATFORM !~ /win32/
-        s.extensions = FileList["ext/**/extconf.rb"]
-    end
-    
-    s.has_rdoc = true
-    s.extra_rdoc_files = ["README"]
-    s.rdoc_options << '--main' << 'README'
-    s.files = ["Rakefile", "README", "LICENSE", "lib/devil.rb", "lib/devil/gosu.rb"] +
-        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.png", "test/*.jpg"].to_a
-
-    if RUBY_PLATFORM =~ /win32/
-        s.files += ["lib/1.8/devil.so", "lib/1.9/devil.so"]
-    end
-
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-end
-
-task :compile => :clean
-
-if RUBY_PLATFORM !~ /win32/
-    Rake::ExtensionTask.new('devil', spec)  do |ext|
-        ext.config_script = 'extconf.rb' 
-        ext.cross_compile = true                
-        ext.cross_platform = 'i386-mswin32'
-    end
-end
-
-Rake::TestTask.new do |t|
-    t.libs << "lib"
-    t.test_files = FileList['test/test*.rb']
-    t.verbose = true
-end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README"
-  rd.rdoc_files.include("README", "lib/devil.rb", "lib/devil/gosu.rb")
-end
-
+require 'rake/clean'
+
+if RUBY_PLATFORM !~ /win32/
+    require 'rake/extensiontask'
+end
+
+require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+DEVIL_VERSION = "0.1.8"
+
+dlext = Config::CONFIG['DLEXT']
+
+CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~", "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
+CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o", "doc/**")
+
+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.author = "Jaroslaw Tworek, John Mair (banisterfiend)"
+    s.email = 'jrmair@gmail.com'
+    s.date = Time.now.strftime '%Y-%m-%d'
+    s.require_path = 'lib'
+    s.homepage = "http://banisterfiend.wordpress.com"
+
+    if RUBY_PLATFORM =~ /win32/
+        s.platform = Gem::Platform::CURRENT
+    else
+        s.platform = Gem::Platform::RUBY
+    end
+
+    if RUBY_PLATFORM !~ /win32/
+        s.extensions = FileList["ext/**/extconf.rb"]
+    end
+    
+    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"] +
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.png", "test/*.jpg"].to_a
+
+    if RUBY_PLATFORM =~ /win32/
+        s.files += ["lib/1.8/devil.so", "lib/1.9/devil.so"]
+    end
+
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_zip = false
+    pkg.need_tar = false
+end
+
+task :compile => :clean
+
+if RUBY_PLATFORM !~ /win32/
+    Rake::ExtensionTask.new('devil', spec)  do |ext|
+        ext.config_script = 'extconf.rb' 
+        ext.cross_compile = true                
+        ext.cross_platform = 'i386-mswin32'
+    end
+end
+
+Rake::TestTask.new do |t|
+    t.libs << "lib"
+    t.test_files = FileList['test/test*.rb']
+    t.verbose = true
+end
+
+Rake::RDocTask.new do |rd|
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/devil.rb", "lib/devil/gosu.rb")
+end
+

data/ext/devil/ruby_il.c

@@ -151,7 +151,7 @@ static VALUE il_GetData(VALUE obj) {
 /*     void* data = ImageData2Arr(rb_data); */
 
 /*     ILuint uint = ilCopyPixels(XOff, YOff, ZOff, Width, Height, Depth, Format, Type, data); */
-/*     return INT2FIX(uint);     */
+/*     return INT2FIX(uint); */
 /* } */
 
 static VALUE il_SetData(VALUE obj, VALUE rb_Data) {
@@ -242,6 +242,13 @@ static VALUE il_Enable(VALUE obj, VALUE rb_mode) {
     return flag ? Qtrue : Qfalse;
 }
 
+static VALUE il_Disable(VALUE obj, VALUE rb_mode) {
+    ILenum mode = NUM2INT(rb_mode);
+
+    ILboolean flag = ilDisable(mode);
+    return flag ? Qtrue : Qfalse;
+}
+
 static VALUE il_GetInteger(VALUE obj, VALUE rb_mode) {
     ILenum mode = NUM2INT(rb_mode);
 
@@ -258,13 +265,22 @@ static VALUE il_ConvertImage(VALUE obj, VALUE rb_destformat, VALUE rb_desttype)
     return flag ? Qtrue : Qfalse;
 }
 
+/* TODO: MAKE SURE NO MEMORY LEAKS! */
 /* this function is not actualy in the DevIL API, but im adding it here for convenience */
 static VALUE bf_ToBlob(VALUE obj)
 {
-    ILuint width, height;
+    ILuint width, height, saved_image, copy_image;
     char * img_ptr;
     VALUE blob;
+
+    saved_image = ilGetInteger(IL_CUR_IMAGE);
+
+    /* make a copy of the current image */
+    copy_image = ilCloneCurImage();
+
+    ilBindImage(copy_image);
     
+    /* ensure the image is int RGBA UNSIGNED_BYTE format for blob */
     ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE);
 
     width = ilGetInteger(IL_IMAGE_WIDTH);
@@ -274,6 +290,11 @@ static VALUE bf_ToBlob(VALUE obj)
 
     blob = rb_str_new(img_ptr, 4 * width * height);
 
+    /* restore saved binding */
+    ilBindImage(saved_image);
+
+    ilDeleteImages(1, &copy_image);
+
     return blob;
 }
 
@@ -282,17 +303,22 @@ static VALUE bf_FromBlob(VALUE obj, VALUE blob, VALUE rb_width, VALUE rb_height)
     ILubyte * data;
     ILuint width, height;
     ILuint image;
+    ILuint saved_image;
 
     width = NUM2INT(rb_width);
     height = NUM2INT(rb_height);
 
     data = (ILubyte *) RSTRING_PTR(blob);
 
+    saved_image = ilGetInteger(IL_CUR_IMAGE);
+
     ilGenImages(1, &image);
     ilBindImage(image);
 
     ilTexImage(width, height, 1, 4, IL_RGBA, IL_UNSIGNED_BYTE, data);
 
+    ilBindImage(saved_image);
+
     return INT2NUM(image);
 }
 
@@ -302,6 +328,32 @@ static VALUE il_CloneCurImage(VALUE obj)
 
     return INT2NUM(clone);
 }
+
+static VALUE il_OriginFunc(VALUE obj, VALUE rb_mode)
+{
+    ILenum mode = NUM2INT(rb_mode);
+
+    ILboolean flag = ilOriginFunc(mode);
+    return flag ? Qtrue : Qfalse;    
+}
+
+static VALUE il_ClearColour(VALUE obj, VALUE rb_red, VALUE rb_green, VALUE rb_blue, VALUE rb_alpha)
+{
+    ILubyte red = NUM2INT(rb_red);
+    ILubyte green = NUM2INT(rb_green);
+    ILubyte blue = NUM2INT(rb_blue);
+    ILubyte alpha = NUM2INT(rb_alpha);
+
+    ilClearColour(red, green, blue, alpha);
+
+    return Qnil;
+}
+
+static VALUE il_ClearImage(VALUE obj)
+{
+    ILboolean flag = ilClearImage();
+    return flag ? Qtrue : Qfalse;
+}
 /* end of banisterfiend additions */
 
 void
@@ -338,11 +390,15 @@ InitializeIL() {
 
     /* methods added by baniterfiend */
     rb_define_module_function(mIL, "Enable", il_Enable, 1);
+    rb_define_module_function(mIL, "Disable", il_Disable, 1);
     rb_define_module_function(mIL, "GetInteger", il_GetInteger, 1);
     rb_define_module_function(mIL, "ConvertImage", il_ConvertImage, 2);
     rb_define_module_function(mIL, "ToBlob", bf_ToBlob, 0);
     rb_define_module_function(mIL, "FromBlob", bf_FromBlob, 3);
     rb_define_module_function(mIL, "CloneCurImage", il_CloneCurImage, 0);
+    rb_define_module_function(mIL, "OriginFunc", il_OriginFunc, 1);
+    rb_define_module_function(mIL, "ClearColour", il_ClearColour, 4);
+    rb_define_module_function(mIL, "ClearImage", il_ClearImage, 0);
     /* end of methods added by banisterfiend */
     
     //////////////////////////////////
@@ -434,11 +490,17 @@ InitializeIL() {
     rb_define_const(mIL, "LIB_MNG_ERROR", INT2NUM(IL_LIB_MNG_ERROR));
     rb_define_const(mIL, "UNKNOWN_ERROR", INT2NUM(IL_UNKNOWN_ERROR));
 
-    // CONSTANTS BELOW ADDED BY BANISTERFIEND
+    /* CONSTANTS BELOW ADDED BY BANISTERFIEND */
+    rb_define_const(mIL, "IMAGE_DEPTH", INT2NUM(IL_IMAGE_DEPTH));
     rb_define_const(mIL, "IMAGE_WIDTH", INT2NUM(IL_IMAGE_WIDTH));
     rb_define_const(mIL, "IMAGE_HEIGHT", INT2NUM(IL_IMAGE_HEIGHT));
     rb_define_const(mIL, "IMAGE_FORMAT", INT2NUM(IL_IMAGE_FORMAT));
     rb_define_const(mIL, "FILE_OVERWRITE", INT2NUM(IL_FILE_OVERWRITE));
+    rb_define_const(mIL, "ORIGIN_SET", INT2NUM(IL_ORIGIN_SET));
+    rb_define_const(mIL, "CONV_PAL", INT2NUM(IL_CONV_PAL));
+    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));
 }
 //////////////////////////////////////////