rmagick 4.0.0 → 5.3.0

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