Skip to content

Commit

Permalink
Fixed bug #23391 reported by Lyle Johnson
Browse files Browse the repository at this point in the history 
Minor testcase fix
  • Loading branch information
snoutmate committed Jan 5, 2009
1 parent f25e647 commit 987781c
Show file tree
Hide file tree
Showing 13 changed files with 70 additions and 70 deletions.
6 changes: 3 additions & 3 deletions ext/common/conv.h
View file
Expand Up @@ -131,9 +131,9 @@ int maxlen; \
struct RArray* ary; \
ary = RARRAY(rb_Array(arg)); \
if (maxlen < 1) \
maxlen = ary->len; \
maxlen = RARRAY_LEN(ary); \
else \
maxlen = maxlen < ary->len ? maxlen : ary->len; \
maxlen = maxlen < RARRAY_LEN(ary) ? maxlen : RARRAY_LEN(ary); \
for (i=0; i < maxlen; i++) \
cary[i] = (GL##_type_)_convert_(rb_ary_entry((VALUE)ary,i)); \
return i; \
Expand Down Expand Up @@ -166,7 +166,7 @@ int cols,rows; \
rary = rb_Array(rary); \
rary = rb_funcall(rary,rb_intern("flatten"),0); \
\
if (RARRAY(rary)->len != cols*rows) \
if (RARRAY_LEN(rary) != cols*rows) \
rb_raise(rb_eArgError, "passed array/matrix must have %i*%i elements",cols,rows); \
\
for (i=0; i < cols*rows; i++) \
Expand Down
4 changes: 2 additions & 2 deletions ext/common/funcdef.h
View file
Expand Up @@ -245,7 +245,7 @@ static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
LOAD_GL_FUNC(gl##_name_,_ver_) \
if (TYPE(arg1)==T_ARRAY) { \
GLuint *objects; \
n = RARRAY(arg1)->len; \
n = RARRAY_LEN(arg1); \
objects = ALLOC_N(GLuint,n); \
ary2cuint(arg1,objects,n); \
fptr_gl##_name_(n,objects); \
Expand All @@ -265,7 +265,7 @@ static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
GLsizei n; \
if (TYPE(arg1)==T_ARRAY) { \
GLuint *objects; \
n = RARRAY(arg1)->len; \
n = RARRAY_LEN(arg1); \
objects = ALLOC_N(GLuint,n); \
ary2cuint(arg1,objects,n); \
gl##_name_(n,objects); \
Expand Down
54 changes: 27 additions & 27 deletions ext/gl/gl-1.0-1.1.c
View file
Expand Up @@ -902,7 +902,7 @@ VALUE obj; \
rb_raise(rb_eArgError, "Pixel unpack buffer bound, but offset argument missing"); \
map = (GLenum)NUM2INT(args[0]); \
Check_Type(args[1],T_ARRAY); \
size = RARRAY(args[1])->len; \
size = RARRAY_LEN(args[1]); \
values = ALLOC_N(_vartype_,size); \
_convert_(args[1],values,size); \
glPixelMap##_type_##v(map,size,values); \
Expand Down Expand Up @@ -1985,7 +1985,7 @@ VALUE obj,arg1;
VALUE ary;
int i;
ary = rb_Array(arg1);
size = RARRAY(ary)->len;
size = RARRAY_LEN(ary);
textures = ALLOC_N(GLuint,size);
residences = ALLOC_N(GLboolean,size);
ary2cuint(ary,textures,size);
Expand Down Expand Up @@ -2016,7 +2016,7 @@ VALUE obj,arg1,arg2;
GLsizei size;
Check_Type(arg1,T_ARRAY);
Check_Type(arg2,T_ARRAY);
if ((size = RARRAY(arg1)->len) != RARRAY(arg2)->len)
if ((size = RARRAY_LEN(arg1)) != RARRAY_LEN(arg2))
rb_raise(rb_eArgError, "passed arrays must have the same length");
textures = ALLOC_N(GLuint,size);
priorities = ALLOC_N(GLclampf,size);
Expand Down Expand Up @@ -2058,15 +2058,15 @@ VALUE obj; \
case 1: \
if (TYPE(args[0]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 3: \
gl_Color3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
gl_Color3##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
case 4: \
gl_Color4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
gl_Color4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%li", ary->len); \
rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
} \
} \
else \
Expand Down Expand Up @@ -2108,12 +2108,12 @@ VALUE obj; \
case 1: \
if (TYPE(args[0]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 3: \
gl_Normal3##_type_(obj,ary->ptr[0], ary->ptr[1],ary->ptr[2]); \
gl_Normal3##_type_(obj,RARRAY_PTR(ary)[0], RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%li", ary->len); \
rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
} \
} \
else \
Expand Down Expand Up @@ -2149,15 +2149,15 @@ VALUE obj; \
case 1: \
if (TYPE(args[0]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 2: \
gl_RasterPos2##_type_(obj,ary->ptr[0],ary->ptr[1]); \
gl_RasterPos2##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
break; \
case 3: \
gl_RasterPos3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
gl_RasterPos3##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
case 4: \
gl_RasterPos4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
gl_RasterPos4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%d", num); \
Expand Down Expand Up @@ -2202,12 +2202,12 @@ VALUE obj; \
if (TYPE(args[0]) == T_ARRAY && TYPE(args[1]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
ary2 = RARRAY(args[1]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 2: \
gl_Rect##_type_(obj,ary->ptr[0],ary->ptr[1],ary2->ptr[0],ary2->ptr[1]); \
gl_Rect##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary2)[0],RARRAY_PTR(ary2)[1]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%li", ary->len); \
rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
} \
} \
else \
Expand Down Expand Up @@ -2242,18 +2242,18 @@ VALUE obj; \
case 1: \
if (TYPE(args[0]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 1: \
gl_TexCoord1##_type_(obj,ary->ptr[0]); \
gl_TexCoord1##_type_(obj,RARRAY_PTR(ary)[0]); \
break; \
case 2: \
gl_TexCoord2##_type_(obj,ary->ptr[0],ary->ptr[1]); \
gl_TexCoord2##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
break; \
case 3: \
gl_TexCoord3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
gl_TexCoord3##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
case 4: \
gl_TexCoord4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
gl_TexCoord4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%d", num); \
Expand Down Expand Up @@ -2297,18 +2297,18 @@ VALUE obj; \
case 1: \
if (TYPE(args[0]) == T_ARRAY) { \
ary = RARRAY(args[0]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 2: \
gl_Vertex2##_type_(obj,ary->ptr[0],ary->ptr[1]); \
gl_Vertex2##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
break; \
case 3: \
gl_Vertex3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
gl_Vertex3##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
case 4: \
gl_Vertex4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
gl_Vertex4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
break; \
default: \
rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%li", ary->len); \
rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%li", RARRAY_LEN(ary)); \
} \
} \
else \
Expand Down
10 changes: 5 additions & 5 deletions ext/gl/gl-1.3.c
View file
Expand Up @@ -51,18 +51,18 @@ VALUE obj; \
case 2: \
if (TYPE(args[1]) == T_ARRAY) { \
ary = RARRAY(args[1]); \
switch (ary->len) { \
switch (RARRAY_LEN(ary)) { \
case 1: \
gl_MultiTexCoord1##_type_(obj,args[0],ary->ptr[0]); \
gl_MultiTexCoord1##_type_(obj,args[0],RARRAY_PTR(ary)[0]); \
break; \
case 2: \
gl_MultiTexCoord2##_type_(obj,args[0],ary->ptr[0],ary->ptr[1]); \
gl_MultiTexCoord2##_type_(obj,args[0],RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
break; \
case 3: \
gl_MultiTexCoord3##_type_(obj,args[0],ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
gl_MultiTexCoord3##_type_(obj,args[0],RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
break; \
case 4: \
gl_MultiTexCoord4##_type_(obj,args[0],ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
gl_MultiTexCoord4##_type_(obj,args[0],RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
break; \
default: \
rb_raise(rb_eArgError, "array length:%d", num); \
Expand Down
12 changes: 6 additions & 6 deletions ext/gl/gl-1.4.c
View file
Expand Up @@ -102,8 +102,8 @@ VALUE obj,arg1,arg2,arg3;
GLsizei *ary2;
int len1,len2;
LOAD_GL_FUNC(glMultiDrawArrays,"1.4")
len1 = RARRAY(arg2)->len;
len2 = RARRAY(arg3)->len;
len1 = RARRAY_LEN(arg2);
len2 = RARRAY_LEN(arg3);
if (len1!=len2)
rb_raise(rb_eArgError, "Passed arrays must have same length");
mode = (GLenum)NUM2INT(arg1);
Expand Down Expand Up @@ -143,12 +143,12 @@ VALUE obj;
type = (GLenum)NUM2INT(args[1]);
Check_Type(args[2],T_ARRAY);
ary = RARRAY(args[2]);
size = ary->len;
size = RARRAY_LEN(ary);
counts = ALLOC_N(GLsizei,size);
indices = ALLOC_N(GLvoid*,size);
for (i=0;i<size;i++) {
VALUE data;
data = pack_array_or_pass_string(type,ary->ptr[i]);
data = pack_array_or_pass_string(type,RARRAY_PTR(ary)[i]);
indices[i] = RSTRING_PTR(data);
counts[i] = RSTRING_LEN(data);
}
Expand All @@ -163,10 +163,10 @@ VALUE obj;
type = (GLenum)NUM2INT(args[1]);
Check_Type(args[2],T_ARRAY);
Check_Type(args[3],T_ARRAY);
if (RARRAY(args[2])->len != RARRAY(args[3])->len)
if (RARRAY_LEN(args[2]) != RARRAY_LEN(args[3]))
rb_raise(rb_eArgError, "Count and indices offset array must have same length");

size = RARRAY(args[2])->len;
size = RARRAY_LEN(args[2]);

counts = ALLOC_N(GLsizei,size);
indices = ALLOC_N(GLvoid*,size);
Expand Down
2 changes: 1 addition & 1 deletion ext/gl/gl-2.0.c
View file
Expand Up @@ -64,7 +64,7 @@ VALUE obj,arg1;
GLenum *buffers;
LOAD_GL_FUNC(glDrawBuffers,"2.0")
Check_Type(arg1,T_ARRAY);
size = RARRAY(arg1)->len;
size = RARRAY_LEN(arg1);
buffers = ALLOC_N(GLenum,size);
ary2cuint(arg1,buffers,size);
fptr_glDrawBuffers(size,buffers);
Expand Down
2 changes: 1 addition & 1 deletion ext/gl/gl-ext-arb.c
View file
Expand Up @@ -81,7 +81,7 @@ static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
_type_ cary[_size_]; \
LOAD_GL_FUNC(gl##_name_,_ext_) \
Check_Type(arg1,T_ARRAY); \
if (RARRAY(arg1)->len != _size_) \
if (RARRAY_LEN(arg1) != _size_) \
rb_raise(rb_eArgError, "Incorrect array length - must have '%i' elements.",_size_); \
_conv_(arg1,cary,_size_); \
fptr_gl##_name_(cary); \
Expand Down
2 changes: 1 addition & 1 deletion ext/gl/gl-ext-ati.c
View file
Expand Up @@ -25,7 +25,7 @@ static VALUE gl_DrawBuffersATI(VALUE obj,VALUE arg1)
GLenum *buffers;
LOAD_GL_FUNC(glDrawBuffersATI,"GL_ATI_draw_buffers")
Check_Type(arg1,T_ARRAY);
size = RARRAY(arg1)->len;
size = RARRAY_LEN(arg1);
buffers = ALLOC_N(GLenum,size);
ary2cuint(arg1,buffers,size);
fptr_glDrawBuffersATI(size,buffers);
Expand Down
18 changes: 9 additions & 9 deletions ext/gl/gl-ext-ext.c
View file
Expand Up @@ -41,7 +41,7 @@ VALUE obj,arg1,arg2;
LOAD_GL_FUNC(glPrioritizeTexturesEXT,"GL_EXT_texture_object")
Check_Type(arg1,T_ARRAY);
Check_Type(arg2,T_ARRAY);
if ((size = RARRAY(arg1)->len) != RARRAY(arg2)->len)
if ((size = RARRAY_LEN(arg1)) != RARRAY_LEN(arg2))
rb_raise(rb_eArgError, "passed arrays must have the same length");
textures = ALLOC_N(GLuint,size);
priorities = ALLOC_N(GLclampf,size);
Expand All @@ -68,7 +68,7 @@ VALUE obj,arg1;
int i;
LOAD_GL_FUNC(glAreTexturesResidentEXT,"GL_EXT_texture_object")
ary = rb_Array(arg1);
size = RARRAY(ary)->len;
size = RARRAY_LEN(ary);
textures = ALLOC_N(GLuint,size);
residences = ALLOC_N(GLboolean,size);
ary2cuint(ary,textures,size);
Expand Down Expand Up @@ -217,8 +217,8 @@ VALUE obj,arg1,arg2,arg3;
GLsizei *ary2;
int len1,len2;
LOAD_GL_FUNC(glMultiDrawArraysEXT,"GL_EXT_multi_draw_arrays")
len1 = RARRAY(arg2)->len;
len2 = RARRAY(arg3)->len;
len1 = RARRAY_LEN(arg2);
len2 = RARRAY_LEN(arg3);
if (len1!=len2)
rb_raise(rb_eArgError, "Passed arrays must have same length");
mode = (GLenum)NUM2INT(arg1);
Expand Down Expand Up @@ -258,12 +258,12 @@ VALUE obj;
type = (GLenum)NUM2INT(args[1]);
Check_Type(args[2],T_ARRAY);
ary = RARRAY(args[2]);
size = ary->len;
size = RARRAY_LEN(ary);
counts = ALLOC_N(GLsizei,size);
indices = ALLOC_N(GLvoid*,size);
for (i=0;i<size;i++) {
VALUE data;
data = pack_array_or_pass_string(type,ary->ptr[i]);
data = pack_array_or_pass_string(type,RARRAY_PTR(ary)[i]);

indices[i] = RSTRING_PTR(data);
counts[i] = RSTRING_LEN(data);
Expand All @@ -279,10 +279,10 @@ VALUE obj;
type = (GLenum)NUM2INT(args[1]);
Check_Type(args[2],T_ARRAY);
Check_Type(args[3],T_ARRAY);
if (RARRAY(args[2])->len != RARRAY(args[3])->len)
if (RARRAY_LEN(args[2]) != RARRAY_LEN(args[3]))
rb_raise(rb_eArgError, "Count and indices offset array must have same length");

size = RARRAY(args[2])->len;
size = RARRAY_LEN(args[2]);

counts = ALLOC_N(GLsizei,size);
indices = ALLOC_N(GLvoid*,size);
Expand Down Expand Up @@ -433,7 +433,7 @@ VALUE obj,arg1,arg2,arg3; \
_type_ *cary; \
int len; \
LOAD_GL_FUNC(gl##_name_,_extension_) \
len = RARRAY(rb_Array(arg3))->len; \
len = RARRAY_LEN(rb_Array(arg3)); \
if (len<=0 || (len % 4) != 0) \
rb_raise(rb_eArgError, "Parameter array size must be multiplication of 4"); \
cary = ALLOC_N(_type_,len); \
Expand Down
8 changes: 4 additions & 4 deletions ext/gl/gl-ext-nv.c
View file
Expand Up @@ -191,7 +191,7 @@ VALUE obj,arg1,arg2,arg3; \
_type_ *cary; \
int len; \
LOAD_GL_FUNC(gl##_name_,_extension_) \
len = RARRAY(rb_Array(arg3))->len; \
len = RARRAY_LEN(rb_Array(arg3)); \
if (len<=0 || (len % 4) != 0) \
rb_raise(rb_eArgError, "Parameter array size must be multiplication of 4"); \
cary = ALLOC_N(_type_,len); \
Expand Down Expand Up @@ -260,7 +260,7 @@ VALUE obj,arg1,arg2; \
_type_ *cary; \
int len; \
LOAD_GL_FUNC(gl##_name_,_extension_) \
len = RARRAY(rb_Array(arg2))->len; \
len = RARRAY_LEN(rb_Array(arg2)); \
if (len<=0 || (len % _size_) != 0) \
rb_raise(rb_eArgError, "Parameter array size must be multiplication of %i",_size_); \
cary = ALLOC_N(_type_,len); \
Expand Down Expand Up @@ -352,7 +352,7 @@ static VALUE gl_RequestResidentProgramsNV(VALUE obj,VALUE arg1)
if (TYPE(arg1)==T_ARRAY) {
GLsizei n;
GLuint *programs;
n = RARRAY(arg1)->len;
n = RARRAY_LEN(arg1);
programs = ALLOC_N(GLuint,n);
ary2cuint(arg1,programs,n);
fptr_glRequestResidentProgramsNV( n, programs);
Expand All @@ -378,7 +378,7 @@ static VALUE gl_AreProgramsResidentNV(VALUE obj,VALUE arg1)
int i;
LOAD_GL_FUNC(glAreProgramsResidentNV,"GL_NV_vertex_program")
ary = rb_Array(arg1);
size = RARRAY(ary)->len;
size = RARRAY_LEN(ary);
programs = ALLOC_N(GLuint,size);
residences = ALLOC_N(GLboolean,size);
ary2cuint(ary,programs,size);
Expand Down

0 comments on commit 987781c

Please sign in to comment.