diff --git a/ext/fox16_c/FXRuby.cpp b/ext/fox16_c/FXRuby.cpp
index 260d74d572626b7b1ed299889db54464244ad531..11f2ab13c670cb6f5f1630f69ab1bd74f1b1cf36 100644
--- a/ext/fox16_c/FXRuby.cpp
+++ b/ext/fox16_c/FXRuby.cpp
@@ -466,17 +466,22 @@ FXuint FXRbNumberOfFXColors(VALUE string_or_ary){
return len;
}
-FXColor *FXRbConvertToFXColors(VALUE string_or_ary){
+FXColor *FXRbConvertToFXColors(VALUE string_or_ary, FXuint *opts){
FXColor* pix=0;
if(TYPE(string_or_ary) == T_ARRAY){
if(FXMALLOC(&pix,FXColor,RARRAY_LEN(string_or_ary))){
+ *opts |= IMAGE_OWNED;
for(long i=0; i<RARRAY_LEN(string_or_ary); i++){
pix[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(string_or_ary,i)));
}
}
}else{
- if(FXMALLOC(&pix,FXColor,RSTRING_LEN(string_or_ary)/sizeof(FXColor))){
- memcpy(pix, RSTRING_PTR(string_or_ary), RSTRING_LEN(string_or_ary));
+ if( *opts & IMAGE_OWNED ){
+ if(FXMALLOC(&pix,FXColor,RSTRING_LEN(string_or_ary)/sizeof(FXColor))){
+ memcpy(pix, RSTRING_PTR(string_or_ary), RSTRING_LEN(string_or_ary));
+ }
+ }else{
+ pix = (FXColor*)(RSTRING_PTR(string_or_ary));
}
}
return pix;
diff --git a/ext/fox16_c/include/FXRbImage.h b/ext/fox16_c/include/FXRbImage.h
index c071d8d6de853ae81e572f69b277f6ca5a78918c..f2d658265cce296e36c894463ef6e1081110a4a3 100644
--- a/ext/fox16_c/include/FXRbImage.h
+++ b/ext/fox16_c/include/FXRbImage.h
@@ -143,9 +143,11 @@ protected:
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbImageVirtuals.h"
+
+ VALUE data_string;
public:
/// Create an image
- FXRbImage(FXApp* a,const FXColor* pix=NULL,FXuint opts=0,FXint w=1,FXint h=1):FXImage(a,pix,opts,w,h){
+ FXRbImage(FXApp* a,const FXColor* pix=NULL,FXuint opts=0,FXint w=1,FXint h=1):FXImage(a,pix,opts,w,h),data_string(Qnil){
FXRbRegisterAppSensitiveObject(this);
}
diff --git a/ext/fox16_c/include/FXRuby.h b/ext/fox16_c/include/FXRuby.h
index 6f6b2335fc82b77d69b16835740c340d9050eab1..d54a3e7a094d3d8a9e9f1fba4a2e8dd5b2cc1cc4 100644
--- a/ext/fox16_c/include/FXRuby.h
+++ b/ext/fox16_c/include/FXRuby.h
@@ -163,7 +163,7 @@ extern VALUE FXRbMakeColorArray(const FXColor* colors,FXint w,FXint h);
extern FXuint FXRbNumberOfFXColors(VALUE string_or_ary);
// Allocate a FXColor buffer and populate with data
-extern FXColor *FXRbConvertToFXColors(VALUE string_or_ary);
+extern FXColor *FXRbConvertToFXColors(VALUE string_or_ary, FXuint *opts);
extern void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE data);
diff --git a/ext/fox16_c/markfuncs.cpp b/ext/fox16_c/markfuncs.cpp
index e001bbb3da2c5df972a1a0dccc2069e1ecd43ef6..65d2422c80cac15891e49ad717a669b93a774e67 100644
--- a/ext/fox16_c/markfuncs.cpp
+++ b/ext/fox16_c/markfuncs.cpp
@@ -121,6 +121,9 @@ void FXRbIcon::markfunc(FXIcon* icon){
void FXRbImage::markfunc(FXImage* image){
FXRbDrawable::markfunc(image);
+ if( image ){
+ rb_gc_mark(dynamic_cast<FXRbImage*>(image)->data_string);
+ }
}
diff --git a/rdoc-sources/FXImage.rb b/rdoc-sources/FXImage.rb
index 1bdb698ad097db8a72e3d381fb66fd058103a3da..46292c162d3196497093215c16029a7ff98e18b9 100755
--- a/rdoc-sources/FXImage.rb
+++ b/rdoc-sources/FXImage.rb
@@ -17,7 +17,11 @@ module Fox
# if you intend to do repeated re-rendering of the image after it has been
# created.
# +IMAGE_OWNED+::
- # Does nothing - for backward compatibility only.
+ # If +IMAGE_OWNED+ is set, the image pixel data is copied into the image.
+ # If +IMAGE_OWNED+ is not set, a image pixel string is directly used as
+ # memory buffer of the image, without copying the data.
+ # If pixel data is given as an Array instead of a string, data is copied in
+ # any case.
# +IMAGE_DITHER+::
# Dither image to look better
# +IMAGE_NEAREST+::
@@ -91,7 +95,9 @@ module Fox
#
# Image pixels are stored bytewise as [RGBA] values.
#
- def pixel_string ; end
+ # Optional offset and size can be used to retrieve a part of
+ # the image data. Both are counted in bytes.
+ def pixel_string(offset=nil, size=nil) ; end
#
# Return the color of the pixel at (_x_, _y_).
diff --git a/swig-interfaces/FXImage.i b/swig-interfaces/FXImage.i
index b912a0bcd6f7c6cb26c9bbeffa8eb290a8f8a2af..d01dc08e43fdc696a0926029aa46f3c00d5e61ae 100644
--- a/swig-interfaces/FXImage.i
+++ b/swig-interfaces/FXImage.i
@@ -62,10 +62,11 @@ public:
if(w*h != len){
rb_raise( rb_eArgError, "Array size does not match image size" );
}
- pix=FXRbConvertToFXColors(string_or_ary);
- opts|=IMAGE_OWNED;
+ pix=FXRbConvertToFXColors(string_or_ary, &opts);
}
- return new FXRbImage(a,pix,opts,w,h);
+ FXRbImage *img = new FXRbImage(a,pix,opts,w,h);
+ img->data_string = (opts & IMAGE_OWNED) ? Qnil : string_or_ary;
+ return img;
}
/// To get to the pixel data
@@ -99,8 +100,8 @@ public:
rb_raise( rb_eArgError, "Array size does not match image size" );
}
- FXColor* pix=FXRbConvertToFXColors(string_or_ary);
- opts|=IMAGE_OWNED;
+ FXColor* pix=FXRbConvertToFXColors(string_or_ary, &opts);
+ (dynamic_cast<FXRbImage*>(self))->data_string = (opts & IMAGE_OWNED) ? Qnil : string_or_ary;
if( NIL_P(w) || NIL_P(h) ){
self->setData(pix,opts);
}else{
@@ -129,6 +130,25 @@ public:
return Qnil;
}
}
+
+ VALUE pixel_string(FXlong offset, FXlong size){
+ FXColor* data = self->getData();
+ if (data) {
+ FXlong maxsize = self->getWidth()*self->getHeight()*sizeof(FXColor);
+ if( offset > maxsize || offset < 0 ){
+ return Qnil;
+ }
+ if( offset+size > maxsize ){
+ size = maxsize-offset;
+ }else if( size < 0 ){
+ return Qnil;
+ }
+
+ return rb_str_new((char*)data + offset, size);
+ } else {
+ return Qnil;
+ }
+ }
}
/// Get pixel at x,y
diff --git a/swig-interfaces/ruby-typemaps.i b/swig-interfaces/ruby-typemaps.i
index 929a054157e31cc82659da248ff5abbe72b9a1e7..25c1e936e618a6e346fbdef9550c0a45bcb50dff 100644
--- a/swig-interfaces/ruby-typemaps.i
+++ b/swig-interfaces/ruby-typemaps.i
@@ -43,6 +43,10 @@
%typemap(in) FXlong "$1 = NUM2LONG($input);";
%typemap(in) FXulong "$1 = NUM2ULONG($input);";
+%typecheck(SWIG_TYPECHECK_INTEGER) FXchar, FXuchar, FXshort, FXushort, FXint, FXuint, FXlong, FXulong {
+ $1 = (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM) ? 1 : 0;
+}
+
/* Type-checking rules */
%typecheck(SWIG_TYPECHECK_STRING) const FXString&, FXuchar *data {
$1 = (NIL_P($input) || TYPE($input) == T_STRING) ? 1 : 0;
diff --git a/test/TC_FXImage.rb b/test/TC_FXImage.rb
index 36ff1d694eb5ef947e5bd5c0ca759245bc487c40..e683c46795997e3909f96d929f533c22b869ee83 100755
--- a/test/TC_FXImage.rb
+++ b/test/TC_FXImage.rb
@@ -76,7 +76,7 @@ class TC_FXImage < Fox::TestCase
def test_setPixels_string
img = FXImage.new(app, nil, 0, 2, 1)
img.pixels = "rgbaRGBA"
- assert_equal(IMAGE_OWNED, img.options)
+ assert_equal(0, img.options)
assert_equal("rgbaRGBA", img.pixel_string)
end
@@ -101,7 +101,7 @@ class TC_FXImage < Fox::TestCase
end
def test_create_with_data
- img = FXImage.new(app, "rgbaRGBA", 0, 1, 2)
+ img = FXImage.new(app, "rgbaRGBA", IMAGE_OWNED, 1, 2)
assert_equal("rgbaRGBA", img.pixel_string)
img.create
assert_nil(img.pixels)
@@ -112,6 +112,44 @@ class TC_FXImage < Fox::TestCase
assert_not_nil(img.pixels)
end
+ def image_with_non_owned_data
+ FXImage.new(app, "rgbaRGBA", 0, 1, 2)
+ end
+
+ def test_create_with_non_owned_data
+ GC.stress = true
+ img = image_with_non_owned_data
+ " " * 10000
+ GC.stress = false
+ assert_equal("rgbaRGBA", img.pixel_string)
+ assert_equal(0, img.options)
+ img.create
+ end
+
+ def set_non_owned_data(img)
+ img.setPixels("rgbaRGBA", 0, 2, 1)
+ end
+
+ def test_set_pixel_with_non_owned_data
+ img = FXImage.new(app, nil, 0, 1, 2)
+ GC.stress = true
+ set_non_owned_data(img)
+ " " * 10000
+ GC.stress = false
+ assert_equal("rgbaRGBA", img.pixel_string)
+ assert_equal(0, img.options)
+ img.create
+ end
+
+ def test_partial_pixel_string
+ img = FXImage.new(app, "rgbaRGBA", IMAGE_OWNED, 1, 2)
+ assert_equal("baR", img.pixel_string(2,3))
+ assert_equal(nil, img.pixel_string(-2,3))
+ assert_equal(nil, img.pixel_string(2,-1))
+ assert_equal(nil, img.pixel_string(10,3))
+ assert_equal("baRGBA", img.pixel_string(2,10))
+ end
+
#
# Restore client-side pixel buffer from image.
#