1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
|
From: Mark Somerville <mark@scottishclimbs.com>
Date: Thu, 10 Sep 2009 15:41:39 +0100
Subject: [PATCH] Added back in Ruby 1.8 support. Tested under 1.8.6 and
1.9.1.
The 1.8/1.9 compile time switching is done using a few macros. I'm not
sure if this is the best way to achieve this or not, since I'm not too
familiar with the (Ruby)C way. Any comments on the style will be
appreciated!
Origin: https://github.com/Spakman/ruby-gd/commit/30eb7696a4fad4fc18cf11725da95226e79afd8e
---
GD.c | 140 +++++++++++++++++++++++++++++++++++--------------------------
extconf.rb | 4 ++
2 files changed, 84 insertions(+), 60 deletions(-)
diff --git a/GD.c b/GD.c
index 9a5d061..c6ab8c4 100644
--- a/GD.c
+++ b/GD.c
@@ -10,7 +10,11 @@
$Revision: 1.6.2.3 $
**************************************************************/
#include "ruby.h"
-#include "ruby/io.h"
+#if defined(HAVE_RUBY_IO_H)
+ #include "ruby/io.h"
+#else /* seems like Ruby < 1.9 */
+ #include "rubyio.h"
+#endif
#include "gd.h"
#include "gdfontg.h" /* giant */
@@ -19,6 +23,22 @@
#include "gdfonts.h" /* small */
#include "gdfontt.h" /* tiny */
+/* Is this the best way to do this sort of thing?
+ * It feels kind of wrong, but I'm not sure of the (Ruby)C way.
+ * Any opinions on the style will be gratefully received! */
+
+#if defined(HAVE_RUBY_IO_H) /* seems like Ruby > 1.8 */
+ #define FPTR_TYPE rb_io_t
+ #define FILE_POINTER_FOR_CREATE_FROM fdopen(fptr->fd, "r")
+ #define FPTR_PATH (char*)fptr->pathv
+ #define SECOND_FILE_POINTER rb_io_stdio_file(fptr)
+#else
+ #define FPTR_TYPE OpenFile
+ #define FILE_POINTER_FOR_CREATE_FROM fptr->f
+ #define FPTR_PATH fptr->path
+ #define SECOND_FILE_POINTER (fptr->f2) ? fptr->f2 : fptr->f
+#endif
+
extern VALUE rb_io_binmode(VALUE io);
extern gdImagePtr gdImageCreateFromXpm(char* );
@@ -61,7 +81,7 @@ img_from_pngfname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -71,9 +91,9 @@ img_from_pngfname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromPng(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromPng(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid PNG File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid PNG File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -83,7 +103,7 @@ static VALUE
img_from_png(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -91,9 +111,9 @@ img_from_png(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromPng(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromPng(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid PNG File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid PNG File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -104,7 +124,7 @@ img_from_giffname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -114,9 +134,9 @@ img_from_giffname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGif(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGif(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid GIF File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid GIF File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -125,7 +145,7 @@ static VALUE
img_from_gif(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -133,9 +153,9 @@ img_from_gif(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGif(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGif(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid GIF File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid GIF File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -146,7 +166,7 @@ img_from_gdfname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -156,9 +176,9 @@ img_from_gdfname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGd(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -167,7 +187,7 @@ static VALUE
img_from_gd(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -175,9 +195,9 @@ img_from_gd(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGd(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -186,7 +206,7 @@ img_from_gd2fname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -196,9 +216,9 @@ img_from_gd2fname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd2(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGd2(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd2 File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd2 File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -207,7 +227,7 @@ static VALUE
img_from_gd2(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -215,9 +235,9 @@ img_from_gd2(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd2(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromGd2(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd2 File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd2 File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -227,7 +247,7 @@ img_from_gd2_partfname(klass, fname, srcx, srcy, w, h)
VALUE klass, fname, srcx, srcy, w, h;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -237,10 +257,10 @@ img_from_gd2_partfname(klass, fname, srcx, srcy, w, h)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd2Part(fdopen(fptr->fd, "r"), NUM2INT(srcx),
+ iptr = gdImageCreateFromGd2Part(FILE_POINTER_FOR_CREATE_FROM, NUM2INT(srcx),
NUM2INT(srcy), NUM2INT(w), NUM2INT(h));
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd2 File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd2 File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -249,7 +269,7 @@ static VALUE
img_from_gd2_part(klass, f, srcx, srcy, w, h)
VALUE klass, f, srcx, srcy, w, h;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -257,10 +277,10 @@ img_from_gd2_part(klass, f, srcx, srcy, w, h)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromGd2Part(fdopen(fptr->fd, "r"), NUM2INT(srcx),
+ iptr = gdImageCreateFromGd2Part(FILE_POINTER_FOR_CREATE_FROM, NUM2INT(srcx),
NUM2INT(srcy), NUM2INT(w), NUM2INT(h));
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Gd2 File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Gd2 File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -270,7 +290,7 @@ static VALUE
img_from_xbm(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -278,9 +298,9 @@ img_from_xbm(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromXbm(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromXbm(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Xbm File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Xbm File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -290,7 +310,7 @@ img_from_xbmfname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -300,9 +320,9 @@ img_from_xbmfname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromXbm(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromXbm(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Xbm File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Xbm File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -312,7 +332,7 @@ static VALUE
img_from_xpm(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -321,9 +341,9 @@ img_from_xpm(klass, f)
rb_io_check_readable(fptr);
/* need cast, and the argument is char* type */
- iptr = (gdImagePtr)gdImageCreateFromXpm(fptr->path);
+ iptr = (gdImagePtr)gdImageCreateFromXpm(FPTR_PATH);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)fptr->path);
+ rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -333,7 +353,7 @@ img_from_xpmfname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -344,9 +364,9 @@ img_from_xpmfname(klass, fname)
rb_io_check_readable(fptr);
/* need cast, and the argument is char* type */
- iptr = (gdImagePtr)gdImageCreateFromXpm(fptr->path);
+ iptr = (gdImagePtr)gdImageCreateFromXpm(FPTR_PATH);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)fptr->path);
+ rb_raise(rb_eArgError, "%s is not a valid XPM File", (char*)FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -358,7 +378,7 @@ static VALUE
img_from_jpeg(klass, f)
VALUE klass, f;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(f, T_FILE);
@@ -366,9 +386,9 @@ img_from_jpeg(klass, f)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromJpeg(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromJpeg(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Jpeg File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Jpeg File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -378,7 +398,7 @@ img_from_jpegfname(klass, fname)
VALUE klass, fname;
{
VALUE f;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr iptr;
Check_Type(fname, T_STRING);
@@ -388,9 +408,9 @@ img_from_jpegfname(klass, fname)
GetOpenFile(f, fptr);
rb_io_check_readable(fptr);
- iptr = gdImageCreateFromJpeg(fdopen(fptr->fd, "r"));
+ iptr = gdImageCreateFromJpeg(FILE_POINTER_FOR_CREATE_FROM);
if (!iptr)
- rb_raise(rb_eArgError, "%s is not a valid Jpeg File", (char*)fptr->pathv);
+ rb_raise(rb_eArgError, "%s is not a valid Jpeg File", FPTR_PATH);
return Data_Wrap_Struct(klass,0,free_img,iptr);
}
@@ -1498,7 +1518,7 @@ img_png(img, out)
VALUE img, out;
{
gdImagePtr im;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
FILE *f;
Data_Get_Struct(img, gdImage, im);
@@ -1507,7 +1527,7 @@ img_png(img, out)
GetOpenFile(out, fptr);
rb_io_check_writable(fptr);
- f = rb_io_stdio_file(fptr);
+ f = SECOND_FILE_POINTER;
gdImagePng(im, f);
return img;
@@ -1542,7 +1562,7 @@ img_gif(img, out)
VALUE img, out;
{
gdImagePtr im;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
FILE *f;
Data_Get_Struct(img, gdImage, im);
@@ -1581,7 +1601,7 @@ img_gd(img, out)
VALUE img, out;
{
gdImagePtr im;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
FILE *f;
Data_Get_Struct(img, gdImage, im);
@@ -1589,7 +1609,7 @@ img_gd(img, out)
rb_io_binmode(out);
GetOpenFile(out, fptr);
rb_io_check_writable(fptr);
- f = rb_io_stdio_file(fptr);
+ f = SECOND_FILE_POINTER;
gdImageGd(im, f);
@@ -1600,7 +1620,7 @@ static VALUE
img_gd2(img, out, cs, fmt)
VALUE img, out, cs, fmt;
{
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
gdImagePtr im;
FILE *f;
@@ -1608,7 +1628,7 @@ img_gd2(img, out, cs, fmt)
rb_io_binmode(out);
GetOpenFile(out, fptr);
rb_io_check_writable(fptr);
- f = rb_io_stdio_file(fptr);
+ f = SECOND_FILE_POINTER;
Data_Get_Struct(img, gdImage, im);
gdImageGd2(im, f, NUM2INT(cs), NUM2INT(fmt));
@@ -1623,7 +1643,7 @@ img_jpeg(img, out, quality)
VALUE img, out, quality;
{
gdImagePtr im;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
FILE *f;
Data_Get_Struct(img, gdImage, im);
@@ -1633,7 +1653,7 @@ img_jpeg(img, out, quality)
rb_io_binmode(out);
GetOpenFile(out, fptr);
rb_io_check_writable(fptr);
- f = rb_io_stdio_file(fptr);
+ f = SECOND_FILE_POINTER;
gdImageJpeg(im, f, FIX2INT(quality));
@@ -1668,7 +1688,7 @@ img_wbmp(img, fg, out)
VALUE img, out, fg;
{
gdImagePtr im;
- rb_io_t *fptr;
+ FPTR_TYPE *fptr;
FILE *f;
Data_Get_Struct(img, gdImage, im);
@@ -1678,7 +1698,7 @@ img_wbmp(img, fg, out)
rb_io_binmode(out);
GetOpenFile(out, fptr);
rb_io_check_writable(fptr);
- f = rb_io_stdio_file(fptr);
+ f = SECOND_FILE_POINTER;
gdImageWBMP(im, FIX2INT(fg), f);
diff --git a/extconf.rb b/extconf.rb
index c468683..b14ab5b 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -24,7 +24,11 @@ end
dir_config("gd", "/usr/local/include", "/usr/local/lib")
+have_header('ruby/io.h')
+if have_type("rb_io_t", ["ruby.h", "rubyio.h"])
+ have_struct_member("rb_io_t", "fd", ["ruby.h", "rubyio.h"])
+end
if with_config("xpm")
dir_config("X11", "/usr/X11R6/include", "/usr/X11R6/lib")
|
