rmagick 2.16.0 → 5.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.devcontainer/Dockerfile +14 -0
- data/.devcontainer/ImageMagick6/devcontainer.json +11 -0
- data/.devcontainer/devcontainer.json +11 -0
- data/.devcontainer/setup-repo.sh +10 -0
- data/.devcontainer/setup-user.sh +45 -0
- data/.editorconfig +3 -0
- data/.github/ISSUE_TEMPLATE.md +17 -0
- data/.github/workflows/ci.yml +138 -0
- data/.gitignore +7 -1
- data/.rspec +1 -0
- data/.rubocop.yml +37 -340
- data/.rubocop_todo.yml +448 -0
- data/.yardopts +5 -0
- data/CHANGELOG.md +455 -0
- data/CODE_OF_CONDUCT.md +122 -7
- data/CONTRIBUTING.md +37 -6
- data/Gemfile +0 -6
- data/README.md +316 -0
- data/Rakefile +74 -100
- data/before_install_linux.sh +65 -28
- data/before_install_osx.sh +58 -2
- data/ext/RMagick/extconf.rb +287 -393
- data/ext/RMagick/rmagick.c +106 -111
- data/ext/RMagick/rmagick.h +235 -331
- data/ext/RMagick/rmagick_gvl.h +224 -0
- data/ext/RMagick/rmdraw.c +516 -843
- data/ext/RMagick/rmenum.c +316 -755
- data/ext/RMagick/rmfill.c +281 -191
- data/ext/RMagick/rmilist.c +451 -456
- data/ext/RMagick/rmimage.c +6250 -5290
- data/ext/RMagick/rminfo.c +721 -894
- data/ext/RMagick/rmkinfo.c +228 -0
- data/ext/RMagick/rmmain.c +735 -521
- data/ext/RMagick/rmmontage.c +127 -172
- data/ext/RMagick/rmpixel.c +638 -431
- data/ext/RMagick/rmstruct.c +102 -282
- data/ext/RMagick/rmutil.c +450 -363
- data/lib/rmagick/version.rb +5 -4
- data/lib/rmagick.rb +2 -0
- data/lib/rmagick_internal.rb +349 -413
- data/lib/rvg/clippath.rb +3 -4
- data/lib/rvg/container.rb +30 -22
- data/lib/rvg/deep_equal.rb +11 -11
- data/lib/rvg/describable.rb +2 -2
- data/lib/rvg/embellishable.rb +63 -68
- data/lib/rvg/misc.rb +136 -139
- data/lib/rvg/paint.rb +2 -1
- data/lib/rvg/pathdata.rb +7 -8
- data/lib/rvg/rvg.rb +47 -46
- data/lib/rvg/stretchable.rb +22 -28
- data/lib/rvg/stylable.rb +12 -10
- data/lib/rvg/text.rb +169 -165
- data/lib/rvg/transformable.rb +17 -16
- data/lib/rvg/units.rb +5 -5
- data/rmagick.gemspec +16 -39
- metadata +114 -392
- data/.hound.yml +0 -2
- data/.simplecov +0 -27
- data/.travis.yml +0 -74
- data/Doxyfile +0 -1514
- data/README.textile +0 -251
- data/deprecated/RMagick.rb +0 -6
- data/doc/.cvsignore +0 -1
- data/doc/comtasks.html +0 -287
- data/doc/constants.html +0 -1581
- data/doc/css/doc.css +0 -299
- data/doc/css/popup.css +0 -34
- data/doc/css/ref.css +0 -67
- data/doc/draw.html +0 -3272
- data/doc/ex/InitialCoords.rb +0 -22
- data/doc/ex/NewCoordSys.rb +0 -30
- data/doc/ex/OrigCoordSys.rb +0 -16
- data/doc/ex/PreserveAspectRatio.rb +0 -204
- data/doc/ex/RotateScale.rb +0 -36
- data/doc/ex/Skew.rb +0 -38
- data/doc/ex/Use01.rb +0 -15
- data/doc/ex/Use02.rb +0 -20
- data/doc/ex/Use03.rb +0 -16
- data/doc/ex/ViewBox.rb +0 -31
- data/doc/ex/adaptive_threshold.rb +0 -9
- data/doc/ex/add_noise.rb +0 -16
- data/doc/ex/affine.rb +0 -48
- data/doc/ex/affine_transform.rb +0 -20
- data/doc/ex/arc.rb +0 -49
- data/doc/ex/arcpath.rb +0 -32
- data/doc/ex/arcs01.rb +0 -28
- data/doc/ex/arcs02.rb +0 -59
- data/doc/ex/average.rb +0 -15
- data/doc/ex/axes.rb +0 -64
- data/doc/ex/baseline_shift01.rb +0 -17
- data/doc/ex/bilevel_channel.rb +0 -8
- data/doc/ex/blur_image.rb +0 -12
- data/doc/ex/border.rb +0 -10
- data/doc/ex/bounding_box.rb +0 -42
- data/doc/ex/cbezier1.rb +0 -41
- data/doc/ex/cbezier2.rb +0 -41
- data/doc/ex/cbezier3.rb +0 -41
- data/doc/ex/cbezier4.rb +0 -42
- data/doc/ex/cbezier5.rb +0 -42
- data/doc/ex/cbezier6.rb +0 -53
- data/doc/ex/channel.rb +0 -25
- data/doc/ex/charcoal.rb +0 -12
- data/doc/ex/chop.rb +0 -29
- data/doc/ex/circle.rb +0 -33
- data/doc/ex/circle01.rb +0 -16
- data/doc/ex/clip_path.rb +0 -60
- data/doc/ex/coalesce.rb +0 -57
- data/doc/ex/color_fill_to_border.rb +0 -29
- data/doc/ex/color_floodfill.rb +0 -28
- data/doc/ex/color_histogram.rb +0 -47
- data/doc/ex/color_reset.rb +0 -11
- data/doc/ex/colorize.rb +0 -16
- data/doc/ex/colors.rb +0 -64
- data/doc/ex/compose_mask.rb +0 -22
- data/doc/ex/composite.rb +0 -133
- data/doc/ex/composite_layers.rb +0 -53
- data/doc/ex/composite_tiled.rb +0 -21
- data/doc/ex/contrast.rb +0 -36
- data/doc/ex/crop.rb +0 -31
- data/doc/ex/crop_with_gravity.rb +0 -42
- data/doc/ex/cubic01.rb +0 -43
- data/doc/ex/cubic02.rb +0 -91
- data/doc/ex/cycle_colormap.rb +0 -21
- data/doc/ex/dissolve.rb +0 -12
- data/doc/ex/drawcomp.rb +0 -42
- data/doc/ex/drop_shadow.rb +0 -60
- data/doc/ex/edge.rb +0 -11
- data/doc/ex/ellipse.rb +0 -45
- data/doc/ex/ellipse01.rb +0 -21
- data/doc/ex/emboss.rb +0 -11
- data/doc/ex/enhance.rb +0 -28
- data/doc/ex/equalize.rb +0 -11
- data/doc/ex/evenodd.rb +0 -42
- data/doc/ex/fill_pattern.rb +0 -23
- data/doc/ex/flatten_images.rb +0 -36
- data/doc/ex/flip.rb +0 -11
- data/doc/ex/flop.rb +0 -11
- data/doc/ex/font_styles.rb +0 -32
- data/doc/ex/fonts.rb +0 -20
- data/doc/ex/frame.rb +0 -12
- data/doc/ex/gaussian_blur.rb +0 -11
- data/doc/ex/get_multiline_type_metrics.rb +0 -41
- data/doc/ex/get_pixels.rb +0 -47
- data/doc/ex/get_type_metrics.rb +0 -141
- data/doc/ex/gradientfill.rb +0 -27
- data/doc/ex/grav.rb +0 -45
- data/doc/ex/gravity.rb +0 -80
- data/doc/ex/group.rb +0 -26
- data/doc/ex/hatchfill.rb +0 -27
- data/doc/ex/image.rb +0 -44
- data/doc/ex/images/Apple.miff +0 -0
- data/doc/ex/images/Ballerina.jpg +0 -0
- data/doc/ex/images/Ballerina3.jpg +0 -0
- data/doc/ex/images/Button_0.gif +0 -0
- data/doc/ex/images/Button_1.gif +0 -0
- data/doc/ex/images/Button_2.gif +0 -0
- data/doc/ex/images/Button_3.gif +0 -0
- data/doc/ex/images/Button_4.gif +0 -0
- data/doc/ex/images/Button_5.gif +0 -0
- data/doc/ex/images/Button_6.gif +0 -0
- data/doc/ex/images/Button_7.gif +0 -0
- data/doc/ex/images/Button_8.gif +0 -0
- data/doc/ex/images/Button_9.gif +0 -0
- data/doc/ex/images/Button_A.gif +0 -0
- data/doc/ex/images/Button_B.gif +0 -0
- data/doc/ex/images/Button_C.gif +0 -0
- data/doc/ex/images/Button_D.gif +0 -0
- data/doc/ex/images/Button_E.gif +0 -0
- data/doc/ex/images/Button_F.gif +0 -0
- data/doc/ex/images/Button_G.gif +0 -0
- data/doc/ex/images/Button_H.gif +0 -0
- data/doc/ex/images/Button_I.gif +0 -0
- data/doc/ex/images/Button_J.gif +0 -0
- data/doc/ex/images/Button_K.gif +0 -0
- data/doc/ex/images/Button_L.gif +0 -0
- data/doc/ex/images/Button_M.gif +0 -0
- data/doc/ex/images/Button_N.gif +0 -0
- data/doc/ex/images/Button_O.gif +0 -0
- data/doc/ex/images/Button_P.gif +0 -0
- data/doc/ex/images/Button_Q.gif +0 -0
- data/doc/ex/images/Button_R.gif +0 -0
- data/doc/ex/images/Button_S.gif +0 -0
- data/doc/ex/images/Button_T.gif +0 -0
- data/doc/ex/images/Button_U.gif +0 -0
- data/doc/ex/images/Button_V.gif +0 -0
- data/doc/ex/images/Button_W.gif +0 -0
- data/doc/ex/images/Button_X.gif +0 -0
- data/doc/ex/images/Button_Y.gif +0 -0
- data/doc/ex/images/Button_Z.gif +0 -0
- data/doc/ex/images/Cheetah.jpg +0 -0
- data/doc/ex/images/Coffee.wmf +0 -0
- data/doc/ex/images/Flower_Hat.jpg +0 -0
- data/doc/ex/images/Gold_Statue.jpg +0 -0
- data/doc/ex/images/Hot_Air_Balloons.jpg +0 -0
- data/doc/ex/images/Hot_Air_Balloons_H.jpg +0 -0
- data/doc/ex/images/Leaf.miff +0 -0
- data/doc/ex/images/No.wmf +0 -0
- data/doc/ex/images/Polynesia.jpg +0 -0
- data/doc/ex/images/Red_Rocks.jpg +0 -0
- data/doc/ex/images/Rocks_On_Beach.miff +0 -0
- data/doc/ex/images/Shorts.jpg +0 -0
- data/doc/ex/images/Snake.wmf +0 -0
- data/doc/ex/images/Violin.jpg +0 -0
- data/doc/ex/images/Yellow_Rose.miff +0 -0
- data/doc/ex/images/big-duck.gif +0 -0
- data/doc/ex/images/duck.gif +0 -0
- data/doc/ex/images/duck0.gif +0 -0
- data/doc/ex/images/duck1.gif +0 -0
- data/doc/ex/images/duck10.gif +0 -0
- data/doc/ex/images/duck11.gif +0 -0
- data/doc/ex/images/duck12.gif +0 -0
- data/doc/ex/images/duck13.gif +0 -0
- data/doc/ex/images/duck14.gif +0 -0
- data/doc/ex/images/duck15.gif +0 -0
- data/doc/ex/images/duck2.gif +0 -0
- data/doc/ex/images/duck3.gif +0 -0
- data/doc/ex/images/duck4.gif +0 -0
- data/doc/ex/images/duck5.gif +0 -0
- data/doc/ex/images/duck6.gif +0 -0
- data/doc/ex/images/duck7.gif +0 -0
- data/doc/ex/images/duck8.gif +0 -0
- data/doc/ex/images/duck9.gif +0 -0
- data/doc/ex/images/graydient230x6.gif +0 -0
- data/doc/ex/images/image_with_profile.jpg +0 -0
- data/doc/ex/images/logo400x83.gif +0 -0
- data/doc/ex/images/model.miff +0 -0
- data/doc/ex/images/notimplemented.gif +0 -0
- data/doc/ex/images/smile.miff +0 -0
- data/doc/ex/images/spin.gif +0 -0
- data/doc/ex/implode.rb +0 -34
- data/doc/ex/level.rb +0 -11
- data/doc/ex/level_colors.rb +0 -11
- data/doc/ex/line.rb +0 -41
- data/doc/ex/line01.rb +0 -21
- data/doc/ex/mask.rb +0 -35
- data/doc/ex/matte_fill_to_border.rb +0 -39
- data/doc/ex/matte_floodfill.rb +0 -32
- data/doc/ex/matte_replace.rb +0 -39
- data/doc/ex/median_filter.rb +0 -28
- data/doc/ex/modulate.rb +0 -11
- data/doc/ex/mono.rb +0 -23
- data/doc/ex/morph.rb +0 -25
- data/doc/ex/mosaic.rb +0 -35
- data/doc/ex/motion_blur.rb +0 -11
- data/doc/ex/negate.rb +0 -11
- data/doc/ex/negate_channel.rb +0 -9
- data/doc/ex/nested_rvg.rb +0 -21
- data/doc/ex/nonzero.rb +0 -42
- data/doc/ex/normalize.rb +0 -11
- data/doc/ex/oil_paint.rb +0 -11
- data/doc/ex/opacity.rb +0 -37
- data/doc/ex/ordered_dither.rb +0 -11
- data/doc/ex/path.rb +0 -63
- data/doc/ex/pattern1.rb +0 -25
- data/doc/ex/pattern2.rb +0 -26
- data/doc/ex/polaroid.rb +0 -27
- data/doc/ex/polygon.rb +0 -23
- data/doc/ex/polygon01.rb +0 -21
- data/doc/ex/polyline.rb +0 -22
- data/doc/ex/polyline01.rb +0 -21
- data/doc/ex/posterize.rb +0 -8
- data/doc/ex/preview.rb +0 -8
- data/doc/ex/qbezierpath.rb +0 -52
- data/doc/ex/quad01.rb +0 -34
- data/doc/ex/quantize-m.rb +0 -25
- data/doc/ex/radial_blur.rb +0 -9
- data/doc/ex/raise.rb +0 -8
- data/doc/ex/random_threshold_channel.rb +0 -13
- data/doc/ex/rect01.rb +0 -14
- data/doc/ex/rect02.rb +0 -20
- data/doc/ex/rectangle.rb +0 -34
- data/doc/ex/reduce_noise.rb +0 -28
- data/doc/ex/remap.rb +0 -11
- data/doc/ex/remap_images.rb +0 -19
- data/doc/ex/resize_to_fill.rb +0 -8
- data/doc/ex/resize_to_fit.rb +0 -8
- data/doc/ex/roll.rb +0 -9
- data/doc/ex/rotate.rb +0 -44
- data/doc/ex/rotate_f.rb +0 -14
- data/doc/ex/roundrect.rb +0 -33
- data/doc/ex/rubyname.rb +0 -30
- data/doc/ex/rvg_clippath.rb +0 -12
- data/doc/ex/rvg_linecap.rb +0 -42
- data/doc/ex/rvg_linejoin.rb +0 -40
- data/doc/ex/rvg_opacity.rb +0 -18
- data/doc/ex/rvg_pattern.rb +0 -26
- data/doc/ex/rvg_stroke_dasharray.rb +0 -11
- data/doc/ex/segment.rb +0 -11
- data/doc/ex/sepiatone.rb +0 -7
- data/doc/ex/shade.rb +0 -11
- data/doc/ex/shadow.rb +0 -30
- data/doc/ex/shave.rb +0 -15
- data/doc/ex/shear.rb +0 -10
- data/doc/ex/sketch.rb +0 -17
- data/doc/ex/skewx.rb +0 -51
- data/doc/ex/skewy.rb +0 -47
- data/doc/ex/smile.rb +0 -125
- data/doc/ex/solarize.rb +0 -11
- data/doc/ex/sparse_color.rb +0 -54
- data/doc/ex/splice.rb +0 -8
- data/doc/ex/spread.rb +0 -11
- data/doc/ex/stegano.rb +0 -55
- data/doc/ex/stroke_dasharray.rb +0 -42
- data/doc/ex/stroke_fill.rb +0 -10
- data/doc/ex/stroke_linecap.rb +0 -44
- data/doc/ex/stroke_linejoin.rb +0 -48
- data/doc/ex/stroke_width.rb +0 -49
- data/doc/ex/swirl.rb +0 -17
- data/doc/ex/text.rb +0 -37
- data/doc/ex/text01.rb +0 -16
- data/doc/ex/text_align.rb +0 -36
- data/doc/ex/text_antialias.rb +0 -37
- data/doc/ex/text_styles.rb +0 -19
- data/doc/ex/text_undercolor.rb +0 -28
- data/doc/ex/texture_fill_to_border.rb +0 -34
- data/doc/ex/texture_floodfill.rb +0 -32
- data/doc/ex/texturefill.rb +0 -24
- data/doc/ex/threshold.rb +0 -13
- data/doc/ex/to_blob.rb +0 -13
- data/doc/ex/translate.rb +0 -39
- data/doc/ex/transparent.rb +0 -38
- data/doc/ex/transpose.rb +0 -9
- data/doc/ex/transverse.rb +0 -9
- data/doc/ex/tref01.rb +0 -24
- data/doc/ex/triangle01.rb +0 -15
- data/doc/ex/trim.rb +0 -23
- data/doc/ex/tspan01.rb +0 -17
- data/doc/ex/tspan02.rb +0 -17
- data/doc/ex/tspan03.rb +0 -19
- data/doc/ex/unsharp_mask.rb +0 -28
- data/doc/ex/viewex.rb +0 -33
- data/doc/ex/vignette.rb +0 -12
- data/doc/ex/watermark.rb +0 -27
- data/doc/ex/wave.rb +0 -9
- data/doc/ex/wet_floor.rb +0 -58
- data/doc/ex/writing_mode01.rb +0 -26
- data/doc/ex/writing_mode02.rb +0 -26
- data/doc/ilist.html +0 -2056
- data/doc/image1.html +0 -4680
- data/doc/image2.html +0 -3665
- data/doc/image3.html +0 -4522
- data/doc/imageattrs.html +0 -1638
- data/doc/imusage.html +0 -514
- data/doc/index.html +0 -416
- data/doc/info.html +0 -1499
- data/doc/magick.html +0 -565
- data/doc/optequiv.html +0 -2435
- data/doc/rvg.html +0 -975
- data/doc/rvgclip.html +0 -248
- data/doc/rvggroup.html +0 -305
- data/doc/rvgimage.html +0 -289
- data/doc/rvgpattern.html +0 -475
- data/doc/rvgshape.html +0 -406
- data/doc/rvgstyle.html +0 -270
- data/doc/rvgtext.html +0 -465
- data/doc/rvgtspan.html +0 -238
- data/doc/rvgtut.html +0 -530
- data/doc/rvguse.html +0 -145
- data/doc/rvgxform.html +0 -294
- data/doc/scripts/doc.js +0 -22
- data/doc/scripts/stripeTables.js +0 -23
- data/doc/struct.html +0 -1339
- data/doc/usage.html +0 -1621
- data/examples/constitute.rb +0 -7
- data/examples/crop_with_gravity.rb +0 -42
- data/examples/demo.rb +0 -324
- data/examples/describe.rb +0 -43
- data/examples/find_similar_region.rb +0 -34
- data/examples/histogram.rb +0 -321
- data/examples/identify.rb +0 -185
- data/examples/image_opacity.rb +0 -29
- data/examples/import_export.rb +0 -31
- data/examples/pattern_fill.rb +0 -38
- data/examples/rotating_text.rb +0 -44
- data/examples/spinner.rb +0 -49
- data/examples/thumbnail.rb +0 -64
- data/examples/vignette.rb +0 -78
- data/spec/rmagick/ImageList1_spec.rb +0 -24
- data/spec/rmagick/draw_spec.rb +0 -156
- data/spec/rmagick/image/blue_shift_spec.rb +0 -16
- data/spec/rmagick/image/composite_spec.rb +0 -140
- data/spec/rmagick/image/constitute_spec.rb +0 -15
- data/spec/rmagick/image/dispatch_spec.rb +0 -18
- data/spec/rmagick/image/from_blob_spec.rb +0 -14
- data/spec/rmagick/image/ping_spec.rb +0 -14
- data/spec/rmagick/image/properties_spec.rb +0 -29
- data/spec/spec_helper.rb +0 -4
- data/test/Image1.rb +0 -565
- data/test/Image2.rb +0 -1304
- data/test/Image3.rb +0 -1030
- data/test/ImageList1.rb +0 -806
- data/test/ImageList2.rb +0 -385
- data/test/Image_attributes.rb +0 -697
- data/test/Import_Export.rb +0 -121
- data/test/Info.rb +0 -345
- data/test/Magick.rb +0 -321
- data/test/Pixel.rb +0 -116
- data/test/Preview.rb +0 -57
- data/test/cmyk.icm +0 -0
- data/test/srgb.icm +0 -0
- data/test/test_all_basic.rb +0 -38
- data/test/tmpnam_test.rb +0 -50
- data/wercker.yml +0 -10
data/ext/RMagick/rmmontage.c
CHANGED
@@ -12,8 +12,15 @@
|
|
12
12
|
|
13
13
|
#include "rmagick.h"
|
14
14
|
|
15
|
+
static void Montage_destroy(void *obj);
|
16
|
+
static size_t Montage_memsize(const void *obj);
|
15
17
|
|
16
|
-
|
18
|
+
const rb_data_type_t rm_montage_data_type = {
|
19
|
+
"Magick::ImageList::Montage",
|
20
|
+
{ NULL, Montage_destroy, Montage_memsize, },
|
21
|
+
0, 0,
|
22
|
+
RUBY_TYPED_FROZEN_SHAREABLE,
|
23
|
+
};
|
17
24
|
|
18
25
|
|
19
26
|
/**
|
@@ -22,13 +29,13 @@
|
|
22
29
|
* No Ruby usage (internal function)
|
23
30
|
*
|
24
31
|
* Notes:
|
25
|
-
* - If the Magick::Montage#texture method wrote a texture file, the file is
|
32
|
+
* - If the Magick::ImageList::Montage#texture method wrote a texture file, the file is
|
26
33
|
* deleted here.
|
27
34
|
*
|
28
35
|
* @param obj the montage object
|
29
36
|
*/
|
30
37
|
static void
|
31
|
-
|
38
|
+
Montage_destroy(void *obj)
|
32
39
|
{
|
33
40
|
Montage *montage = obj;
|
34
41
|
|
@@ -41,21 +48,31 @@ destroy_Montage(void *obj)
|
|
41
48
|
}
|
42
49
|
if (montage->info)
|
43
50
|
{
|
44
|
-
|
51
|
+
DestroyMontageInfo(montage->info);
|
45
52
|
montage->info = NULL;
|
46
53
|
}
|
47
54
|
xfree(montage);
|
48
55
|
}
|
49
56
|
|
50
57
|
|
58
|
+
/**
|
59
|
+
* Get Montage object size.
|
60
|
+
*
|
61
|
+
* No Ruby usage (internal function)
|
62
|
+
*
|
63
|
+
* @param ptr pointer to the Montage object
|
64
|
+
*/
|
65
|
+
static size_t
|
66
|
+
Montage_memsize(const void *ptr)
|
67
|
+
{
|
68
|
+
return sizeof(Montage);
|
69
|
+
}
|
70
|
+
|
71
|
+
|
51
72
|
/**
|
52
73
|
* Create a new Montage object.
|
53
74
|
*
|
54
|
-
*
|
55
|
-
* - @verbatim Montage.new @endverbatim
|
56
|
-
*
|
57
|
-
* @param class the Ruby class to use
|
58
|
-
* @return a new Montage object
|
75
|
+
* @return [Magick::ImageList::Montage] a new Montage object
|
59
76
|
*/
|
60
77
|
VALUE
|
61
78
|
Montage_alloc(VALUE class)
|
@@ -73,17 +90,17 @@ Montage_alloc(VALUE class)
|
|
73
90
|
}
|
74
91
|
|
75
92
|
montage_info = CloneMontageInfo(image_info, NULL);
|
76
|
-
(void)
|
93
|
+
(void) DestroyImageInfo(image_info);
|
77
94
|
|
78
95
|
if (!montage_info)
|
79
96
|
{
|
80
|
-
rb_raise(rb_eNoMemError, "not enough memory to initialize Magick::Montage object");
|
97
|
+
rb_raise(rb_eNoMemError, "not enough memory to initialize Magick::ImageList::Montage object");
|
81
98
|
}
|
82
99
|
|
83
100
|
montage = ALLOC(Montage);
|
84
101
|
montage->info = montage_info;
|
85
102
|
montage->compose = OverCompositeOp;
|
86
|
-
montage_obj =
|
103
|
+
montage_obj = TypedData_Wrap_Struct(class, &rm_montage_data_type, montage);
|
87
104
|
|
88
105
|
RB_GC_GUARD(montage_obj);
|
89
106
|
|
@@ -94,165 +111,132 @@ Montage_alloc(VALUE class)
|
|
94
111
|
/**
|
95
112
|
* Set background_color value.
|
96
113
|
*
|
97
|
-
*
|
98
|
-
*
|
99
|
-
*
|
100
|
-
* @param self this object
|
101
|
-
* @param color the color name
|
102
|
-
* @return self
|
114
|
+
* @param color [Magick::Pixel, String] the color name
|
115
|
+
* @return [Magick::Pixel, String] the given color name
|
103
116
|
*/
|
104
117
|
VALUE
|
105
118
|
Montage_background_color_eq(VALUE self, VALUE color)
|
106
119
|
{
|
107
120
|
Montage *montage;
|
108
121
|
|
109
|
-
|
110
|
-
|
111
|
-
return
|
122
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
123
|
+
Color_to_PixelColor(&montage->info->background_color, color);
|
124
|
+
return color;
|
112
125
|
}
|
113
126
|
|
114
127
|
|
115
128
|
/**
|
116
129
|
* Set border_color value.
|
117
130
|
*
|
118
|
-
*
|
119
|
-
*
|
120
|
-
*
|
121
|
-
* @param self this object
|
122
|
-
* @param color the color name
|
123
|
-
* @return self
|
131
|
+
* @param color [Magick::Pixel, String] the color name
|
132
|
+
* @return [Magick::Pixel, String] the given color name
|
124
133
|
*/
|
125
134
|
VALUE
|
126
135
|
Montage_border_color_eq(VALUE self, VALUE color)
|
127
136
|
{
|
128
137
|
Montage *montage;
|
129
138
|
|
130
|
-
|
131
|
-
|
132
|
-
return
|
139
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
140
|
+
Color_to_PixelColor(&montage->info->border_color, color);
|
141
|
+
return color;
|
133
142
|
}
|
134
143
|
|
135
144
|
|
136
145
|
/**
|
137
146
|
* Set border_width value.
|
138
147
|
*
|
139
|
-
*
|
140
|
-
*
|
141
|
-
*
|
142
|
-
* @param self this object
|
143
|
-
* @param width the width
|
144
|
-
* @return self
|
148
|
+
* @param width [Numeric] the width
|
149
|
+
* @return [Numeric] the given width
|
145
150
|
*/
|
146
151
|
VALUE
|
147
152
|
Montage_border_width_eq(VALUE self, VALUE width)
|
148
153
|
{
|
149
154
|
Montage *montage;
|
150
155
|
|
151
|
-
|
156
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
152
157
|
montage->info->border_width = NUM2ULONG(width);
|
153
|
-
return
|
158
|
+
return width;
|
154
159
|
}
|
155
160
|
|
156
161
|
|
157
162
|
/**
|
158
163
|
* Set a composition operator.
|
159
164
|
*
|
160
|
-
*
|
161
|
-
*
|
162
|
-
*
|
163
|
-
* @param self this object
|
164
|
-
* @param compose the composition operator
|
165
|
-
* @return self
|
165
|
+
* @param compose [Magick::CompositeOperator] the composition operator
|
166
|
+
* @return [Magick::CompositeOperator] the given compose operator
|
166
167
|
*/
|
167
168
|
VALUE
|
168
169
|
Montage_compose_eq(VALUE self, VALUE compose)
|
169
170
|
{
|
170
171
|
Montage *montage;
|
171
172
|
|
172
|
-
|
173
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
173
174
|
VALUE_TO_ENUM(compose, montage->compose, CompositeOperator);
|
174
|
-
return
|
175
|
+
return compose;
|
175
176
|
}
|
176
177
|
|
177
178
|
|
178
179
|
/**
|
179
180
|
* Set filename value.
|
180
181
|
*
|
181
|
-
*
|
182
|
-
*
|
183
|
-
*
|
184
|
-
* @param self this object
|
185
|
-
* @param filename the filename
|
186
|
-
* @return self
|
182
|
+
* @param filename [String] the filename
|
183
|
+
* @return [String] filename
|
187
184
|
*/
|
188
185
|
VALUE
|
189
186
|
Montage_filename_eq(VALUE self, VALUE filename)
|
190
187
|
{
|
191
188
|
Montage *montage;
|
192
189
|
|
193
|
-
|
194
|
-
|
195
|
-
return
|
190
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
191
|
+
strlcpy(montage->info->filename, StringValueCStr(filename), sizeof(montage->info->filename));
|
192
|
+
return filename;
|
196
193
|
}
|
197
194
|
|
198
195
|
|
199
196
|
/**
|
200
197
|
* Set fill value.
|
201
198
|
*
|
202
|
-
*
|
203
|
-
*
|
204
|
-
*
|
205
|
-
* @param self this object
|
206
|
-
* @param color the color name
|
207
|
-
* @return self
|
199
|
+
* @param color [Magick::Pixel, String] the color name
|
200
|
+
* @return [Magick::Pixel, String] the given color name
|
208
201
|
*/
|
209
202
|
VALUE
|
210
203
|
Montage_fill_eq(VALUE self, VALUE color)
|
211
204
|
{
|
212
205
|
Montage *montage;
|
213
206
|
|
214
|
-
|
215
|
-
|
216
|
-
return
|
207
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
208
|
+
Color_to_PixelColor(&montage->info->fill, color);
|
209
|
+
return color;
|
217
210
|
}
|
218
211
|
|
219
212
|
|
220
213
|
/**
|
221
214
|
* Set font value.
|
222
215
|
*
|
223
|
-
*
|
224
|
-
*
|
225
|
-
*
|
226
|
-
* @param self this object
|
227
|
-
* @param font the font name
|
228
|
-
* @return self
|
216
|
+
* @param font [String] the font name
|
217
|
+
* @return [String] the given font name
|
229
218
|
*/
|
230
219
|
VALUE
|
231
220
|
Montage_font_eq(VALUE self, VALUE font)
|
232
221
|
{
|
233
222
|
Montage *montage;
|
234
223
|
|
235
|
-
|
236
|
-
magick_clone_string(&montage->info->font,
|
224
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
225
|
+
magick_clone_string(&montage->info->font, StringValueCStr(font));
|
237
226
|
|
238
|
-
return
|
227
|
+
return font;
|
239
228
|
}
|
240
229
|
|
241
230
|
|
242
231
|
/**
|
243
232
|
* Set frame value.
|
244
233
|
*
|
245
|
-
*
|
246
|
-
*
|
234
|
+
* - The geometry is a string in the form:
|
235
|
+
* <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
|
236
|
+
* or a Geometry object
|
247
237
|
*
|
248
|
-
*
|
249
|
-
*
|
250
|
-
* @verbatim <width>x<height>+<outer-bevel-width>+<inner-bevel-width> @endverbatim
|
251
|
-
* or a Geometry object
|
252
|
-
*
|
253
|
-
* @param self this object
|
254
|
-
* @param frame_arg the frame geometry
|
255
|
-
* @return self
|
238
|
+
* @param frame_arg [String] the frame geometry
|
239
|
+
* @see https://www.imagemagick.org/Magick++/Geometry.html
|
256
240
|
*/
|
257
241
|
VALUE
|
258
242
|
Montage_frame_eq(VALUE self, VALUE frame_arg)
|
@@ -260,25 +244,26 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
|
|
260
244
|
Montage *montage;
|
261
245
|
VALUE frame;
|
262
246
|
|
263
|
-
|
264
|
-
frame =
|
265
|
-
magick_clone_string(&montage->info->frame,
|
247
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
248
|
+
frame = rb_String(frame_arg);
|
249
|
+
magick_clone_string(&montage->info->frame, StringValueCStr(frame));
|
266
250
|
|
267
251
|
RB_GC_GUARD(frame);
|
268
252
|
|
269
|
-
return
|
253
|
+
return frame_arg;
|
270
254
|
}
|
271
255
|
|
272
256
|
|
273
257
|
/**
|
274
258
|
* Set geometry value.
|
275
259
|
*
|
276
|
-
*
|
277
|
-
*
|
260
|
+
* - The geometry is a string in the form:
|
261
|
+
* <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
|
262
|
+
* or a Geometry object
|
278
263
|
*
|
279
|
-
* @param
|
280
|
-
* @
|
281
|
-
* @
|
264
|
+
* @param geometry_arg [String] the geometry
|
265
|
+
* @return [String] the given geometry
|
266
|
+
* @see https://www.imagemagick.org/Magick++/Geometry.html
|
282
267
|
*/
|
283
268
|
VALUE
|
284
269
|
Montage_geometry_eq(VALUE self, VALUE geometry_arg)
|
@@ -286,45 +271,37 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
|
|
286
271
|
Montage *montage;
|
287
272
|
VALUE geometry;
|
288
273
|
|
289
|
-
|
290
|
-
geometry =
|
291
|
-
magick_clone_string(&montage->info->geometry,
|
274
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
275
|
+
geometry = rb_String(geometry_arg);
|
276
|
+
magick_clone_string(&montage->info->geometry, StringValueCStr(geometry));
|
292
277
|
|
293
278
|
RB_GC_GUARD(geometry);
|
294
279
|
|
295
|
-
return
|
280
|
+
return geometry_arg;
|
296
281
|
}
|
297
282
|
|
298
283
|
|
299
284
|
/**
|
300
285
|
* Set gravity value.
|
301
286
|
*
|
302
|
-
*
|
303
|
-
*
|
304
|
-
*
|
305
|
-
* @param self this object
|
306
|
-
* @param gravity the gravity type
|
307
|
-
* @return self
|
287
|
+
* @param gravity [Magick::GravityType] the gravity type
|
288
|
+
* @return [Magick::GravityType] the given gravity
|
308
289
|
*/
|
309
290
|
VALUE
|
310
291
|
Montage_gravity_eq(VALUE self, VALUE gravity)
|
311
292
|
{
|
312
293
|
Montage *montage;
|
313
294
|
|
314
|
-
|
295
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
315
296
|
VALUE_TO_ENUM(gravity, montage->info->gravity, GravityType);
|
316
|
-
return
|
297
|
+
return gravity;
|
317
298
|
}
|
318
299
|
|
319
300
|
|
320
301
|
/**
|
321
302
|
* Initialize a Montage object. Does nothing currently.
|
322
303
|
*
|
323
|
-
*
|
324
|
-
* - @verbatim Magick::Montage#initialize @endverbatim
|
325
|
-
*
|
326
|
-
* @param self this object
|
327
|
-
* @return self
|
304
|
+
* @return [Magick::ImageList::Montage] self
|
328
305
|
*/
|
329
306
|
VALUE
|
330
307
|
Montage_initialize(VALUE self)
|
@@ -337,96 +314,77 @@ Montage_initialize(VALUE self)
|
|
337
314
|
/**
|
338
315
|
* Set matte_color value.
|
339
316
|
*
|
340
|
-
*
|
341
|
-
*
|
342
|
-
*
|
343
|
-
* @param self this object
|
344
|
-
* @param color the color name
|
345
|
-
* @return self
|
317
|
+
* @param color [Magick::Pixel, String] the color name
|
318
|
+
* @return [Magick::Pixel, String] the given color name
|
346
319
|
*/
|
347
320
|
VALUE
|
348
321
|
Montage_matte_color_eq(VALUE self, VALUE color)
|
349
322
|
{
|
350
323
|
Montage *montage;
|
351
324
|
|
352
|
-
|
353
|
-
|
354
|
-
return
|
325
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
326
|
+
Color_to_PixelColor(&montage->info->matte_color, color);
|
327
|
+
return color;
|
355
328
|
}
|
356
329
|
|
357
330
|
|
358
331
|
/**
|
359
332
|
* Set pointsize value.
|
360
333
|
*
|
361
|
-
*
|
362
|
-
*
|
363
|
-
*
|
364
|
-
* @param self this object
|
365
|
-
* @param size the point size
|
366
|
-
* @return self
|
334
|
+
* @param size [Numeric] the point size
|
335
|
+
* @return [Numeric] the given point size
|
367
336
|
*/
|
368
337
|
VALUE
|
369
338
|
Montage_pointsize_eq(VALUE self, VALUE size)
|
370
339
|
{
|
371
340
|
Montage *montage;
|
372
341
|
|
373
|
-
|
342
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
374
343
|
montage->info->pointsize = NUM2DBL(size);
|
375
|
-
return
|
344
|
+
return size;
|
376
345
|
}
|
377
346
|
|
378
347
|
|
379
348
|
/**
|
380
349
|
* Set shadow value.
|
381
350
|
*
|
382
|
-
*
|
383
|
-
*
|
384
|
-
*
|
385
|
-
* @param self this object
|
386
|
-
* @param shadow the shadow
|
387
|
-
* @return self
|
351
|
+
* @param shadow [Bool] true if the shadow will be enabled
|
352
|
+
* @return [Bool] the given value
|
388
353
|
*/
|
389
354
|
VALUE
|
390
355
|
Montage_shadow_eq(VALUE self, VALUE shadow)
|
391
356
|
{
|
392
357
|
Montage *montage;
|
393
358
|
|
394
|
-
|
359
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
395
360
|
montage->info->shadow = (MagickBooleanType) RTEST(shadow);
|
396
|
-
return
|
361
|
+
return shadow;
|
397
362
|
}
|
398
363
|
|
399
364
|
|
400
365
|
/**
|
401
366
|
* Set stroke value.
|
402
367
|
*
|
403
|
-
*
|
404
|
-
*
|
405
|
-
*
|
406
|
-
* @param self this object
|
407
|
-
* @param color the color name
|
408
|
-
* @return self
|
368
|
+
* @param color [Magick::Pixel, String] the color name
|
369
|
+
* @return [Magick::Pixel, String] the given color name
|
409
370
|
*/
|
410
371
|
VALUE
|
411
372
|
Montage_stroke_eq(VALUE self, VALUE color)
|
412
373
|
{
|
413
374
|
Montage *montage;
|
414
375
|
|
415
|
-
|
416
|
-
|
417
|
-
return
|
376
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
377
|
+
Color_to_PixelColor(&montage->info->stroke, color);
|
378
|
+
return color;
|
418
379
|
}
|
419
380
|
|
420
381
|
|
421
382
|
/**
|
422
383
|
* Set texture value.
|
423
384
|
*
|
424
|
-
*
|
425
|
-
*
|
426
|
-
*
|
427
|
-
* @param self this object
|
428
|
-
* @param texture the texture image
|
429
|
-
* @return self
|
385
|
+
* @param texture [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
|
386
|
+
* imagelist, uses the current image.
|
387
|
+
* @return [Magick::Image] the given texture image
|
430
388
|
*/
|
431
389
|
VALUE
|
432
390
|
Montage_texture_eq(VALUE self, VALUE texture)
|
@@ -435,7 +393,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
|
|
435
393
|
Image *texture_image;
|
436
394
|
char temp_name[MaxTextExtent];
|
437
395
|
|
438
|
-
|
396
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
439
397
|
|
440
398
|
// If we had a previously defined temp texture image,
|
441
399
|
// remove it now in preparation for this new one.
|
@@ -450,22 +408,23 @@ Montage_texture_eq(VALUE self, VALUE texture)
|
|
450
408
|
texture_image = rm_check_destroyed(texture);
|
451
409
|
|
452
410
|
// Write a temp copy of the image & save its name.
|
453
|
-
rm_write_temp_image(texture_image, temp_name);
|
411
|
+
rm_write_temp_image(texture_image, temp_name, sizeof(temp_name));
|
454
412
|
magick_clone_string(&montage->info->texture, temp_name);
|
455
413
|
|
456
|
-
return
|
414
|
+
return texture;
|
457
415
|
}
|
458
416
|
|
459
417
|
|
460
418
|
/**
|
461
419
|
* Set tile value.
|
462
420
|
*
|
463
|
-
*
|
464
|
-
*
|
421
|
+
* - The geometry is a string in the form:
|
422
|
+
* <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
|
423
|
+
* or a Geometry object
|
465
424
|
*
|
466
|
-
* @param
|
467
|
-
* @
|
468
|
-
* @
|
425
|
+
* @param tile_arg [String] the tile geometry
|
426
|
+
* @return [String] the given tile geometry
|
427
|
+
* @see https://www.imagemagick.org/Magick++/Geometry.html
|
469
428
|
*/
|
470
429
|
VALUE
|
471
430
|
Montage_tile_eq(VALUE self, VALUE tile_arg)
|
@@ -473,43 +432,39 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
|
|
473
432
|
Montage *montage;
|
474
433
|
VALUE tile;
|
475
434
|
|
476
|
-
|
477
|
-
tile =
|
478
|
-
magick_clone_string(&montage->info->tile,
|
435
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
436
|
+
tile = rb_String(tile_arg);
|
437
|
+
magick_clone_string(&montage->info->tile, StringValueCStr(tile));
|
479
438
|
|
480
439
|
RB_GC_GUARD(tile);
|
481
440
|
|
482
|
-
return
|
441
|
+
return tile_arg;
|
483
442
|
}
|
484
443
|
|
485
444
|
|
486
445
|
/**
|
487
446
|
* Set title value.
|
488
447
|
*
|
489
|
-
*
|
490
|
-
*
|
491
|
-
*
|
492
|
-
* @param self this object
|
493
|
-
* @param title the title
|
494
|
-
* @return self
|
448
|
+
* @param title [String] the title
|
449
|
+
* @return [String] the given title
|
495
450
|
*/
|
496
451
|
VALUE
|
497
452
|
Montage_title_eq(VALUE self, VALUE title)
|
498
453
|
{
|
499
454
|
Montage *montage;
|
500
455
|
|
501
|
-
|
502
|
-
magick_clone_string(&montage->info->title,
|
503
|
-
return
|
456
|
+
TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
|
457
|
+
magick_clone_string(&montage->info->title, StringValueCStr(title));
|
458
|
+
return title;
|
504
459
|
}
|
505
460
|
|
506
461
|
|
507
462
|
/**
|
508
|
-
* Return a new Magick::Montage object.
|
463
|
+
* Return a new Magick::ImageList::Montage object.
|
509
464
|
*
|
510
465
|
* No Ruby usage (internal function)
|
511
466
|
*
|
512
|
-
* @return a new Magick::Montage object
|
467
|
+
* @return a new Magick::ImageList::Montage object
|
513
468
|
*/
|
514
469
|
VALUE
|
515
470
|
rm_montage_new(void)
|