gosu 1.4.6 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (320) hide show
  1. checksums.yaml +4 -4
  2. data/COPYING +2 -1
  3. data/dependencies/SDL/include/SDL3/SDL.h +91 -0
  4. data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
  5. data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
  6. data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
  7. data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
  8. data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
  9. data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
  10. data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
  11. data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
  12. data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
  13. data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
  14. data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
  15. data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
  16. data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
  17. data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
  18. data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
  19. data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
  20. data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
  21. data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
  22. data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
  23. data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
  24. data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
  25. data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
  26. data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
  27. data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
  28. data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
  29. data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
  30. data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
  31. data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
  32. data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
  33. data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
  34. data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
  35. data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
  36. data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
  37. data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
  38. data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
  39. data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
  40. data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
  41. data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
  42. data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
  43. data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
  44. data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
  45. data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
  46. data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
  47. data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
  48. data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
  49. data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
  50. data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
  51. data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
  52. data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
  53. data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
  54. data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
  55. data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
  56. data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
  57. data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
  58. data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
  59. data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
  60. data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
  61. data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
  62. data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
  63. data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
  64. data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
  65. data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
  66. data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
  67. data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
  68. data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
  69. data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
  70. data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
  71. data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
  72. data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
  73. data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
  74. data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
  75. data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
  76. data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
  77. data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
  78. data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
  79. data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
  80. data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
  81. data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
  82. data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
  83. data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
  84. data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
  85. data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
  86. data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
  87. data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
  88. data/dependencies/SDL_sound/SDL_sound.c +136 -215
  89. data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
  90. data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
  91. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
  92. data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
  93. data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
  94. data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
  95. data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
  96. data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
  97. data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
  98. data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
  99. data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
  100. data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
  101. data/dependencies/SDL_sound/dr_flac.h +1890 -1301
  102. data/dependencies/SDL_sound/dr_mp3.h +1098 -660
  103. data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
  104. data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
  105. data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
  106. data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
  107. data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
  108. data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
  109. data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
  110. data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
  111. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
  112. data/dependencies/SDL_sound/stb_vorbis.h +397 -342
  113. data/dependencies/mojoAL/AL/alc.h +2 -2
  114. data/dependencies/mojoAL/mojoal.c +2120 -1885
  115. data/dependencies/stb/stb_image.h +1190 -1379
  116. data/dependencies/stb/stb_image_write.h +329 -129
  117. data/dependencies/stb/stb_truetype.h +304 -60
  118. data/dependencies/utf8proc/utf8proc.c +133 -75
  119. data/dependencies/utf8proc/utf8proc.h +131 -50
  120. data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
  121. data/ext/gosu-ffi/extconf.rb +103 -0
  122. data/ext/gosu-ffi/gosu-ffi.def +467 -0
  123. data/ffi/Gosu.cpp +330 -0
  124. data/ffi/Gosu.h +84 -0
  125. data/ffi/Gosu_Channel.cpp +62 -0
  126. data/ffi/Gosu_Channel.h +17 -0
  127. data/ffi/Gosu_Color.cpp +176 -0
  128. data/ffi/Gosu_Color.h +31 -0
  129. data/ffi/Gosu_Constants.cpp +334 -0
  130. data/ffi/Gosu_FFI.h +34 -0
  131. data/ffi/Gosu_FFI_internal.h +160 -0
  132. data/ffi/Gosu_Font.cpp +97 -0
  133. data/ffi/Gosu_Font.h +32 -0
  134. data/ffi/Gosu_Image.cpp +239 -0
  135. data/ffi/Gosu_Image.h +71 -0
  136. data/ffi/Gosu_Sample.cpp +29 -0
  137. data/ffi/Gosu_Sample.h +14 -0
  138. data/ffi/Gosu_Song.cpp +69 -0
  139. data/ffi/Gosu_Song.h +18 -0
  140. data/ffi/Gosu_TextInput.cpp +94 -0
  141. data/ffi/Gosu_TextInput.h +25 -0
  142. data/ffi/Gosu_Window.cpp +314 -0
  143. data/ffi/Gosu_Window.h +78 -0
  144. data/include/Gosu/Audio.hpp +6 -11
  145. data/include/Gosu/Bitmap.hpp +38 -53
  146. data/include/Gosu/Buffer.hpp +54 -0
  147. data/include/Gosu/Color.hpp +29 -36
  148. data/include/Gosu/Directories.hpp +25 -28
  149. data/include/Gosu/Drawable.hpp +58 -0
  150. data/include/Gosu/Font.hpp +6 -5
  151. data/include/Gosu/Fwd.hpp +4 -6
  152. data/include/Gosu/Gosu.hpp +5 -5
  153. data/include/Gosu/Graphics.hpp +53 -61
  154. data/include/Gosu/GraphicsBase.hpp +1 -11
  155. data/include/Gosu/Image.hpp +12 -15
  156. data/include/Gosu/Math.hpp +50 -72
  157. data/include/Gosu/Transform.hpp +32 -0
  158. data/include/Gosu/Utility.hpp +77 -1
  159. data/include/Gosu/Version.hpp +2 -2
  160. data/include/Gosu/Window.hpp +15 -9
  161. data/lib/SDL3.dll +0 -0
  162. data/lib/gosu/channel.rb +50 -0
  163. data/lib/gosu/color.rb +173 -0
  164. data/lib/gosu/compat.rb +130 -17
  165. data/lib/gosu/constants.rb +386 -0
  166. data/lib/gosu/ffi.rb +269 -0
  167. data/lib/gosu/font.rb +62 -0
  168. data/lib/gosu/gl_tex_info.rb +33 -0
  169. data/lib/gosu/gosu.rb +250 -0
  170. data/lib/gosu/image.rb +179 -0
  171. data/lib/gosu/numeric.rb +17 -0
  172. data/lib/gosu/preview.rb +6 -6
  173. data/lib/gosu/sample.rb +25 -0
  174. data/lib/gosu/song.rb +57 -0
  175. data/lib/gosu/text_input.rb +83 -0
  176. data/lib/gosu/window.rb +249 -0
  177. data/lib/gosu.rb +29 -8
  178. data/lib64/SDL3.dll +0 -0
  179. data/rdoc/gosu.rb +2 -2
  180. data/src/Audio.cpp +30 -24
  181. data/src/AudioFile.hpp +5 -4
  182. data/src/AudioFileAudioToolbox.cpp +8 -8
  183. data/src/AudioFileSDLSound.cpp +12 -15
  184. data/src/BinPacker.cpp +188 -0
  185. data/src/BinPacker.hpp +55 -0
  186. data/src/Bitmap.cpp +172 -143
  187. data/src/BitmapIO.cpp +60 -86
  188. data/src/Buffer.cpp +150 -0
  189. data/src/ClipRectStack.cpp +38 -0
  190. data/src/ClipRectStack.hpp +17 -83
  191. data/src/Color.cpp +75 -80
  192. data/src/Directories.cpp +47 -0
  193. data/src/DirectoriesUIKit.cpp +50 -0
  194. data/src/DrawOp.hpp +20 -18
  195. data/src/DrawOpQueue.hpp +27 -33
  196. data/src/Drawable.cpp +95 -0
  197. data/src/EmptyDrawable.hpp +38 -0
  198. data/src/FPS.cpp +31 -0
  199. data/src/Font.cpp +104 -74
  200. data/src/GosuGLView.cpp +13 -11
  201. data/src/GosuViewController.cpp +2 -10
  202. data/src/Graphics.cpp +86 -145
  203. data/src/GraphicsImpl.hpp +14 -68
  204. data/src/Image.cpp +41 -35
  205. data/src/Input.cpp +73 -78
  206. data/src/Macro.cpp +46 -29
  207. data/src/Macro.hpp +23 -17
  208. data/src/MarkupParser.cpp +5 -5
  209. data/src/Math.cpp +48 -22
  210. data/src/OffScreenTarget.cpp +47 -50
  211. data/src/OffScreenTarget.hpp +13 -11
  212. data/src/OpenGLContext.cpp +116 -0
  213. data/src/OpenGLContext.hpp +41 -0
  214. data/src/RenderState.hpp +49 -71
  215. data/src/Resolution.cpp +65 -53
  216. data/src/TexChunk.cpp +35 -80
  217. data/src/TexChunk.hpp +44 -35
  218. data/src/Text.cpp +1 -1
  219. data/src/TextBuilder.cpp +35 -21
  220. data/src/TextBuilder.hpp +6 -9
  221. data/src/TextInput.cpp +9 -9
  222. data/src/Texture.cpp +62 -80
  223. data/src/Texture.hpp +25 -23
  224. data/src/TiledDrawable.cpp +149 -0
  225. data/src/TiledDrawable.hpp +47 -0
  226. data/src/TimingApple.cpp +1 -1
  227. data/src/Transform.cpp +45 -50
  228. data/src/TransformStack.hpp +16 -16
  229. data/src/TrueTypeFont.cpp +59 -51
  230. data/src/TrueTypeFont.hpp +6 -7
  231. data/src/TrueTypeFontApple.cpp +28 -19
  232. data/src/TrueTypeFontUnix.cpp +39 -32
  233. data/src/TrueTypeFontWin.cpp +30 -30
  234. data/src/Utility.cpp +113 -37
  235. data/src/UtilityWin.cpp +49 -0
  236. data/src/Window.cpp +121 -151
  237. data/src/WindowUIKit.cpp +14 -14
  238. metadata +165 -118
  239. data/dependencies/SDL/include/SDL.h +0 -233
  240. data/dependencies/SDL/include/SDL_assert.h +0 -320
  241. data/dependencies/SDL/include/SDL_atomic.h +0 -415
  242. data/dependencies/SDL/include/SDL_audio.h +0 -1500
  243. data/dependencies/SDL/include/SDL_clipboard.h +0 -141
  244. data/dependencies/SDL/include/SDL_config.h +0 -331
  245. data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
  246. data/dependencies/SDL/include/SDL_endian.h +0 -348
  247. data/dependencies/SDL/include/SDL_error.h +0 -163
  248. data/dependencies/SDL/include/SDL_events.h +0 -1166
  249. data/dependencies/SDL/include/SDL_filesystem.h +0 -149
  250. data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
  251. data/dependencies/SDL/include/SDL_gesture.h +0 -117
  252. data/dependencies/SDL/include/SDL_guid.h +0 -100
  253. data/dependencies/SDL/include/SDL_haptic.h +0 -1341
  254. data/dependencies/SDL/include/SDL_hidapi.h +0 -451
  255. data/dependencies/SDL/include/SDL_hints.h +0 -2569
  256. data/dependencies/SDL/include/SDL_joystick.h +0 -1066
  257. data/dependencies/SDL/include/SDL_keyboard.h +0 -353
  258. data/dependencies/SDL/include/SDL_keycode.h +0 -358
  259. data/dependencies/SDL/include/SDL_loadso.h +0 -115
  260. data/dependencies/SDL/include/SDL_log.h +0 -404
  261. data/dependencies/SDL/include/SDL_main.h +0 -275
  262. data/dependencies/SDL/include/SDL_mouse.h +0 -465
  263. data/dependencies/SDL/include/SDL_mutex.h +0 -471
  264. data/dependencies/SDL/include/SDL_name.h +0 -33
  265. data/dependencies/SDL/include/SDL_pixels.h +0 -644
  266. data/dependencies/SDL/include/SDL_platform.h +0 -261
  267. data/dependencies/SDL/include/SDL_quit.h +0 -58
  268. data/dependencies/SDL/include/SDL_rect.h +0 -376
  269. data/dependencies/SDL/include/SDL_render.h +0 -1919
  270. data/dependencies/SDL/include/SDL_revision.h +0 -7
  271. data/dependencies/SDL/include/SDL_rwops.h +0 -841
  272. data/dependencies/SDL/include/SDL_sensor.h +0 -322
  273. data/dependencies/SDL/include/SDL_shape.h +0 -155
  274. data/dependencies/SDL/include/SDL_stdinc.h +0 -830
  275. data/dependencies/SDL/include/SDL_surface.h +0 -997
  276. data/dependencies/SDL/include/SDL_system.h +0 -623
  277. data/dependencies/SDL/include/SDL_syswm.h +0 -386
  278. data/dependencies/SDL/include/SDL_test_images.h +0 -78
  279. data/dependencies/SDL/include/SDL_test_random.h +0 -115
  280. data/dependencies/SDL/include/SDL_thread.h +0 -464
  281. data/dependencies/SDL/include/SDL_timer.h +0 -222
  282. data/dependencies/SDL/include/SDL_touch.h +0 -150
  283. data/dependencies/SDL/include/SDL_version.h +0 -204
  284. data/dependencies/SDL/include/SDL_video.h +0 -2150
  285. data/dependencies/SDL/include/SDL_vulkan.h +0 -215
  286. data/dependencies/SDL/include/begin_code.h +0 -187
  287. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  288. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  289. data/dependencies/SDL_sound/SDL_sound.h +0 -725
  290. data/ext/gosu/extconf.rb +0 -119
  291. data/include/Gosu/IO.hpp +0 -254
  292. data/include/Gosu/ImageData.hpp +0 -53
  293. data/include/Gosu/Inspection.hpp +0 -7
  294. data/lib/SDL2.dll +0 -0
  295. data/lib/gosu/patches.rb +0 -66
  296. data/lib/gosu/run.rb +0 -20
  297. data/lib/gosu/swig_patches.rb +0 -110
  298. data/lib64/SDL2.dll +0 -0
  299. data/src/BlockAllocator.cpp +0 -131
  300. data/src/BlockAllocator.hpp +0 -32
  301. data/src/DirectoriesApple.cpp +0 -69
  302. data/src/DirectoriesUnix.cpp +0 -46
  303. data/src/DirectoriesWin.cpp +0 -65
  304. data/src/EmptyImageData.hpp +0 -52
  305. data/src/FileUnix.cpp +0 -99
  306. data/src/FileWin.cpp +0 -88
  307. data/src/IO.cpp +0 -60
  308. data/src/Iconv.hpp +0 -51
  309. data/src/Inspection.cpp +0 -27
  310. data/src/LargeImageData.cpp +0 -215
  311. data/src/LargeImageData.hpp +0 -39
  312. data/src/Log.hpp +0 -19
  313. data/src/RubyGosu.cxx +0 -13100
  314. data/src/RubyGosu.h +0 -49
  315. data/src/WinUtility.cpp +0 -61
  316. data/src/WinUtility.hpp +0 -27
  317. /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
  318. /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
  319. /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
  320. /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
data/src/Bitmap.cpp CHANGED
@@ -1,200 +1,229 @@
1
1
  #include <Gosu/Bitmap.hpp>
2
2
  #include <Gosu/GraphicsBase.hpp>
3
+ #include <algorithm> // for std::equal, std::fill_n
4
+ #include <cstring> // for std::memcpy
5
+ #include <limits>
3
6
  #include <stdexcept> // for std::invalid_argument
4
- #include <utility> // for std::swap
7
+ #include <utility> // for std::move, std::swap
5
8
 
6
- Gosu::Bitmap::Bitmap(int width, int height, Gosu::Color c)
9
+ static void check_bitmap_size(int width, int height)
7
10
  {
8
- resize(width, height, c);
11
+ if (width < 0 || height < 0) {
12
+ throw std::invalid_argument("Negative Gosu::Bitmap size");
13
+ }
14
+
15
+ // Don't allow bitmaps where there are more than INT_MAX pixels.
16
+ if (height != 0 && width > std::numeric_limits<int>::max() / height) {
17
+ throw std::invalid_argument("Gosu::Bitmap size out of bounds");
18
+ }
9
19
  }
10
20
 
11
- void Gosu::Bitmap::swap(Bitmap& other)
21
+ Gosu::Bitmap::Bitmap(int width, int height, Color c)
22
+ : m_width(width),
23
+ m_height(height)
12
24
  {
13
- std::swap(m_pixels, other.m_pixels);
14
- std::swap(m_width, other.m_width);
15
- std::swap(m_height, other.m_height);
25
+ check_bitmap_size(width, height);
26
+
27
+ const int size = width * height;
28
+ m_pixels = Buffer(size * sizeof(Color));
29
+ std::fill_n(data(), size, c);
16
30
  }
17
31
 
18
- void Gosu::Bitmap::resize(int width, int height, Color c)
32
+ Gosu::Bitmap::Bitmap(int width, int height, Buffer&& buffer)
33
+ : m_width(width),
34
+ m_height(height),
35
+ m_pixels(std::move(buffer))
19
36
  {
20
- if (width < 0 || height < 0) throw std::invalid_argument{"negative bitmap size"};
37
+ check_bitmap_size(width, height);
21
38
 
22
- if (width == m_width && height == m_height) return;
39
+ const int size = width * height;
40
+ if (static_cast<std::size_t>(size) * sizeof(Color) != m_pixels.size()) {
41
+ throw std::length_error("Gosu::Bitmap given Gosu::Buffer of wrong size, expected "
42
+ + std::to_string(size * sizeof(Color)) + ", given "
43
+ + std::to_string(m_pixels.size()));
44
+ }
45
+ }
23
46
 
24
- Bitmap temp;
25
- temp.m_width = width;
26
- temp.m_height = height;
27
- temp.m_pixels.resize(width * height, c);
28
- temp.insert(0, 0, *this);
29
- swap(temp);
47
+ void Gosu::Bitmap::resize(int width, int height, Color c)
48
+ {
49
+ if (width != m_width || height != m_height) {
50
+ Bitmap temp(width, height, c);
51
+ temp.insert(*this, 0, 0);
52
+ std::swap(*this, temp);
53
+ }
30
54
  }
31
55
 
32
56
  void Gosu::Bitmap::blend_pixel(int x, int y, Color c)
33
57
  {
34
- if (c.alpha == 0) return;
58
+ if (c.alpha == 0) {
59
+ return;
60
+ }
35
61
 
36
- Color out = get_pixel(x, y);
37
- if (out.alpha == 0) {
38
- set_pixel(x, y, c);
62
+ Color& out = pixel(x, y);
63
+ if (out.alpha == 0 || c.alpha == 255) {
64
+ out = c;
39
65
  return;
40
66
  }
41
67
 
42
68
  int inv_alpha = out.alpha * (255 - c.alpha) / 255;
43
69
 
44
70
  out.alpha = (c.alpha + inv_alpha);
45
- out.red = ((c.red * c.alpha + out.red * inv_alpha) / out.alpha);
71
+ out.red = ((c.red * c.alpha + out.red * inv_alpha) / out.alpha);
46
72
  out.green = ((c.green * c.alpha + out.green * inv_alpha) / out.alpha);
47
- out.blue = ((c.blue * c.alpha + out.blue * inv_alpha) / out.alpha);
48
-
49
- set_pixel(x, y, out);
73
+ out.blue = ((c.blue * c.alpha + out.blue * inv_alpha) / out.alpha);
50
74
  }
51
75
 
52
- void Gosu::Bitmap::insert(int x, int y, const Bitmap& source)
76
+ void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
53
77
  {
54
- insert(x, y, source, 0, 0, source.width(), source.height());
78
+ insert(source, x, y, Rect::covering(source));
55
79
  }
56
80
 
57
- void Gosu::Bitmap::insert(int x, int y, const Bitmap& source,
58
- int src_x, int src_y, int src_width, int src_height)
81
+ void Gosu::Bitmap::insert(const Bitmap& source, int x, int y, Rect source_rect)
59
82
  {
60
- // TODO: This should use memcpy if possible (x == 0 && src_width == this->width())
61
-
62
- if (x < 0) {
63
- int clip_left = -x;
64
-
65
- if (clip_left >= src_width) return;
66
-
67
- src_x += clip_left;
68
- src_width -= clip_left;
69
- x = 0;
83
+ if (&source == this) {
84
+ throw std::invalid_argument("Gosu::Bitmap::insert cannot copy parts of itself");
70
85
  }
71
86
 
72
- if (y < 0) {
73
- int clip_top = -y;
87
+ // Make sure that the source area does not exceed the source image.
88
+ // If we need to move the source_rect origin, then also move the target rectangle origin.
89
+ source_rect.clip_to(Rect::covering(source), &x, &y);
74
90
 
75
- if (clip_top >= src_height) return;
91
+ // Set up the target area and make sure that it does not exceed this image.
92
+ Rect target_rect = Rect::xywh(x, y, source_rect.width, source_rect.height);
93
+ // If we need to move the target_rect origin, then also move the source_rect origin.
94
+ target_rect.clip_to(Rect::covering(*this), &source_rect.x, &source_rect.y);
76
95
 
77
- src_y += clip_top;
78
- src_height -= clip_top;
79
- y = 0;
80
- }
96
+ // These are the first source and first destination pixels/rows.
97
+ Color* target_ptr = &pixel(target_rect.x, target_rect.y);
98
+ const Color* source_ptr = &source.pixel(source_rect.x, source_rect.y);
81
99
 
82
- if (x + src_width > m_width) {
83
- if (x >= m_width) return;
100
+ // target_rect might be smaller than source_rect now, so use its width/height for copying.
84
101
 
85
- src_width = m_width - x;
102
+ if (width() == source.width() && width() == target_rect.width) {
103
+ // If both images have the same width, and we want to copy full lines, then we can use a
104
+ // single memcpy for the whole operation. This is especially likely if we vertically resize
105
+ // a bitmap.
106
+ const int size = target_rect.width * target_rect.height;
107
+ std::memcpy(target_ptr, source_ptr, static_cast<std::size_t>(size) * sizeof(Color));
86
108
  }
87
-
88
- if (y + src_height > m_height) {
89
- if (y >= m_height) return;
90
-
91
- src_height = m_height - y;
92
- }
93
-
94
- for (int rel_y = 0; rel_y < src_height; ++rel_y) {
95
- for (int rel_x = 0; rel_x < src_width; ++rel_x) {
96
- set_pixel(x + rel_x, y + rel_y, source.get_pixel(src_x + rel_x, src_y + rel_y));
109
+ else {
110
+ // Otherwise, we need to copy line by line.
111
+ for (int row = 0; row < target_rect.height; ++row) {
112
+ std::memcpy(target_ptr, source_ptr, target_rect.width * sizeof(Color));
113
+ target_ptr += width();
114
+ source_ptr += source.width();
97
115
  }
98
116
  }
99
117
  }
100
118
 
101
- void Gosu::apply_color_key(Bitmap& bitmap, Color key)
119
+ bool Gosu::Bitmap::operator==(const Bitmap& other) const
102
120
  {
103
- for (int y = 0; y < bitmap.height(); ++y) {
104
- for (int x = 0; x < bitmap.width(); ++x) {
105
- if (bitmap.get_pixel(x, y) == key) {
106
- // Calculate the average R/G/B of adjacent, non-transparent pixels.
107
- unsigned neighbors = 0, red = 0, green = 0, blue = 0;
108
- auto visit = [&](Color c) {
109
- if (c != key) {
110
- neighbors += 1;
111
- red += c.red;
112
- green += c.green;
113
- blue += c.blue;
114
- }
115
- };
116
-
117
- if (x > 0) visit(bitmap.get_pixel(x - 1, y));
118
- if (x < bitmap.width() - 1) visit(bitmap.get_pixel(x + 1, y));
119
- if (y > 0) visit(bitmap.get_pixel(x, y - 1));
120
- if (y < bitmap.height() - 1) visit(bitmap.get_pixel(x, y + 1));
121
-
122
- Color replacement = Color::NONE;
123
- if (neighbors > 0) {
124
- replacement.red = red / neighbors;
125
- replacement.green = green / neighbors;
126
- replacement.blue = blue / neighbors;
127
- }
128
- bitmap.set_pixel(x, y, replacement);
129
- }
130
- }
131
- }
121
+ int pixels = width() * height();
122
+ return pixels == other.width() * other.height()
123
+ && std::equal(data(), data() + pixels, other.data());
132
124
  }
133
125
 
134
- Gosu::Bitmap Gosu::apply_border_flags(unsigned image_flags, const Bitmap& source,
135
- int src_x, int src_y, int src_width, int src_height)
126
+ void Gosu::Bitmap::apply_color_key(Color key)
136
127
  {
137
- // By default, we add one pixel of transparent data around the whole image to so that during
138
- // interpolation, the image just fades out, instead of bleeding into adjacent image data on
139
- // whatever shared texture atlas it ends up on.
140
- // However, if a border is marked as "tileable", we instead repeat the outermost pixels, which
141
- // leads to a nice sharp/hard border with no interpolation at all.
142
-
143
- // TODO: Instead of using Color::NONE (transparent black) for non-tileable image, still repeat
144
- // the border pixel colors, but turn them fully transparent.
145
-
146
- // Backward compatibility: This used to be 'bool tileable'.
147
- if (image_flags == 1) image_flags = IF_TILEABLE;
128
+ // The valid memory range from which the loop below can read.
129
+ const int pixels = width() * height();
130
+ Color* begin = data();
131
+ Color* end = begin + pixels;
132
+
133
+ for (Color* c = begin; c != end;) {
134
+ for (int x = 0; x < width(); ++x, ++c) {
135
+ // All colors except the color key should stay as they are.
136
+ if (*c != key) {
137
+ continue;
138
+ }
148
139
 
149
- Gosu::Bitmap dest{src_width + 2, src_height + 2};
140
+ unsigned neighbors = 0, red = 0, green = 0, blue = 0;
150
141
 
151
- // The borders are made "harder" by duplicating the original bitmap's
152
- // borders.
142
+ const auto visit = [&](const Color* neighbor) {
143
+ if (neighbor >= begin && neighbor < end && *neighbor != key && neighbor->alpha) {
144
+ // Ignore other pixels that are or were equal to the color key.
145
+ neighbors += 1;
146
+ red += neighbor->red;
147
+ green += neighbor->green;
148
+ blue += neighbor->blue;
149
+ }
150
+ };
151
+ // Don't look at (x-1) pixels in the first column because we might accidentally use
152
+ // the pixels of the last column through wraparound.
153
+ if (x != 0) {
154
+ visit(c - width() - 1);
155
+ visit(c - 1);
156
+ visit(c + width() - 1);
157
+ }
158
+ visit(c - width());
159
+ visit(c + width());
160
+ // Don't look at (x+1) pixels in the last column because we might accidentally use
161
+ // the pixels of the first column through wraparound.
162
+ if (x != width() - 1) {
163
+ visit(c - width() + 1);
164
+ visit(c + 1);
165
+ visit(c + width() + 1);
166
+ }
153
167
 
154
- // Top.
155
- if (image_flags & IF_TILEABLE_TOP) {
156
- dest.insert(1, 0,
157
- source, src_x, src_y, src_width, 1);
158
- }
159
- // Bottom.
160
- if (image_flags & IF_TILEABLE_BOTTOM) {
161
- dest.insert(1, dest.height() - 1,
162
- source, src_x, src_y + src_height - 1, src_width, 1);
163
- }
164
- // Left.
165
- if (image_flags & IF_TILEABLE_LEFT) {
166
- dest.insert(0, 1,
167
- source, src_x, src_y, 1, src_height);
168
- }
169
- // Right.
170
- if (image_flags & IF_TILEABLE_RIGHT) {
171
- dest.insert(dest.width() - 1, 1,
172
- source, src_x + src_width - 1, src_y, 1, src_height);
168
+ *c = Color::NONE;
169
+ if (neighbors > 0) {
170
+ c->red = red / neighbors;
171
+ c->green = green / neighbors;
172
+ c->blue = blue / neighbors;
173
+ }
174
+ }
173
175
  }
176
+ }
174
177
 
175
- // Top left.
176
- if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_LEFT)) {
177
- dest.set_pixel(0, 0,
178
- source.get_pixel(src_x, src_y));
178
+ Gosu::Bitmap Gosu::apply_border_flags(unsigned image_flags, const Bitmap& source, Rect source_rect)
179
+ {
180
+ // Add one extra pixel around all four sides of the image.
181
+ Gosu::Bitmap result(source_rect.width + 2, source_rect.height + 2);
182
+ result.insert(source, 1, 1, source_rect);
183
+
184
+ // Now duplicate the edges of the image on all four sides.
185
+ const Rect top { source_rect.x, source_rect.y, source_rect.width, 1 };
186
+ result.insert(source, 1, 0, top);
187
+ const Rect bottom { source_rect.x, source_rect.bottom() - 1, source_rect.width, 1 };
188
+ result.insert(source, 1, result.height() - 1, bottom);
189
+ const Rect left { source_rect.x, source_rect.y, 1, source_rect.height };
190
+ result.insert(source, 0, 1, left);
191
+ const Rect right { source_rect.right() - 1, source_rect.y, 1, source_rect.height };
192
+ result.insert(source, result.width() - 1, 1, right);
193
+ // Also duplicate the corners of each size.
194
+ const Rect top_left { source_rect.x, source_rect.y, 1, 1 };
195
+ result.insert(source, 0, 0, top_left);
196
+ const Rect top_right { source_rect.right() - 1, source_rect.y, 1, 1 };
197
+ result.insert(source, result.width() - 1, 0, top_right);
198
+ const Rect bottom_left { source_rect.x, source_rect.bottom() - 1, 1, 1 };
199
+ result.insert(source, 0, result.height() - 1, bottom_left);
200
+ const Rect bottom_right { source_rect.right() - 1, source_rect.bottom() - 1, 1, 1 };
201
+ result.insert(source, result.width() - 1, result.height() - 1, bottom_right);
202
+
203
+ // On edges which are supposed to have tileable borders, we are now finished.
204
+ // Where soft borders are desired, we need to make all pixels on a side fully transparent.
205
+ if ((image_flags & IF_TILEABLE_TOP) == 0) {
206
+ for (int x = 0; x < result.width(); ++x) {
207
+ result.pixel(x, 0).alpha = 0;
208
+ }
179
209
  }
180
- // Top right.
181
- if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_RIGHT)) {
182
- dest.set_pixel(dest.width() - 1, 0,
183
- source.get_pixel(src_x + src_width - 1, src_y));
210
+ if ((image_flags & IF_TILEABLE_BOTTOM) == 0) {
211
+ const int y = result.height() - 1;
212
+ for (int x = 0; x < result.width(); ++x) {
213
+ result.pixel(x, y).alpha = 0;
214
+ }
184
215
  }
185
- // Bottom left.
186
- if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_LEFT)) {
187
- dest.set_pixel(0, dest.height() - 1,
188
- source.get_pixel(src_x, src_y + src_height - 1));
216
+ if ((image_flags & IF_TILEABLE_LEFT) == 0) {
217
+ for (int y = 0; y < result.height(); ++y) {
218
+ result.pixel(0, y).alpha = 0;
219
+ }
189
220
  }
190
- // Bottom right.
191
- if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_RIGHT)) {
192
- dest.set_pixel(dest.width() - 1, dest.height() - 1,
193
- source.get_pixel(src_x + src_width - 1, src_y + src_height - 1));
221
+ if ((image_flags & IF_TILEABLE_RIGHT) == 0) {
222
+ const int x = result.width() - 1;
223
+ for (int y = 0; y < result.height(); ++y) {
224
+ result.pixel(x, y).alpha = 0;
225
+ }
194
226
  }
195
227
 
196
- // Now put the final image into the prepared borders.
197
- dest.insert(1, 1,
198
- source, src_x, src_y, src_width, src_height);
199
- return dest;
228
+ return result;
200
229
  }
data/src/BitmapIO.cpp CHANGED
@@ -1,94 +1,63 @@
1
1
  #include <Gosu/Bitmap.hpp>
2
2
  #include <Gosu/Utility.hpp>
3
- #include <cstring> // for std::memcpy, std::size_t
4
3
  #include <stdexcept> // for std::runtime_error
5
4
 
6
5
  #define STB_IMAGE_IMPLEMENTATION
7
6
  #define STBI_NO_STDIO
8
- #define STBI_NO_LINEAR
7
+ #define STBI_NO_LINEAR // we don't really care about this, but it avoids warnings
9
8
 
10
9
  #include <stb_image.h>
11
10
 
12
- static int read_callback(void* user, char* data, int size)
11
+ namespace
13
12
  {
14
- Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
15
- std::size_t remaining = reader->resource().size() - reader->position();
16
- std::size_t adjusted_size = (size < remaining ? size : remaining);
17
- reader->read(data, adjusted_size);
18
- return static_cast<int>(adjusted_size);
19
- }
20
-
21
- static void skip_callback(void* user, int n)
22
- {
23
- Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
24
- reader->set_position(reader->position() + n);
25
- }
26
-
27
- static int eof_callback(void* user)
28
- {
29
- Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
30
- return reader->position() == reader->resource().size();
31
- }
32
-
33
- static bool is_bmp(Gosu::Reader reader)
34
- {
35
- std::size_t remaining = reader.resource().size() - reader.position();
36
- if (remaining < 2) return false;
37
- char magic_bytes[2];
38
- reader.read(&magic_bytes, sizeof magic_bytes);
39
- return magic_bytes[0] == 'B' && magic_bytes[1] == 'M';
40
- }
41
-
42
- /// Returns a copy of the given Gosu::Image with the alpha channel removed.
43
- /// Every pixel with alpha==0 will be replaced by Gosu::Color::FUCHSIA.
44
- static std::vector<Gosu::Color::Channel> bitmap_to_rgb(const Gosu::Bitmap& bmp)
45
- {
46
- std::vector<Gosu::Color::Channel> rgb(static_cast<std::size_t>(bmp.width() * bmp.height() * 3));
47
- for (std::size_t offset = 0; offset < rgb.size(); offset += 3) {
48
- const Gosu::Color& color = bmp.data()[offset / 3];
49
- if (color.alpha == 0) {
50
- rgb[offset + 0] = 0xff;
51
- rgb[offset + 1] = 0x00;
52
- rgb[offset + 2] = 0xff;
53
- } else {
54
- rgb[offset + 0] = color.red;
55
- rgb[offset + 1] = color.green;
56
- rgb[offset + 2] = color.blue;
13
+ constexpr int JPEG_QUALITY = 80;
14
+
15
+ /// Returns a copy of the given Gosu::Image with the alpha channel removed.
16
+ /// Every pixel with alpha==0 will be replaced by Gosu::Color::FUCHSIA.
17
+ std::vector<Gosu::Color::Channel> remove_alpha_channel(const Gosu::Bitmap& bmp)
18
+ {
19
+ std::vector<Gosu::Color::Channel> rgb(
20
+ static_cast<std::size_t>(bmp.width() * bmp.height() * 3));
21
+ for (std::size_t offset = 0; offset < rgb.size(); offset += 3) {
22
+ const Gosu::Color& color = bmp.data()[offset / 3];
23
+ if (color.alpha == 0) {
24
+ rgb[offset + 0] = 0xff;
25
+ rgb[offset + 1] = 0x00;
26
+ rgb[offset + 2] = 0xff;
27
+ }
28
+ else {
29
+ rgb[offset + 0] = color.red;
30
+ rgb[offset + 1] = color.green;
31
+ rgb[offset + 2] = color.blue;
32
+ }
57
33
  }
34
+ return rgb;
58
35
  }
59
- return rgb;
60
36
  }
61
37
 
62
38
  Gosu::Bitmap Gosu::load_image_file(const std::string& filename)
63
39
  {
64
- Buffer buffer;
65
- load_file(buffer, filename);
66
- return load_image_file(buffer.front_reader());
40
+ return load_image(load_file(filename));
67
41
  }
68
42
 
69
- Gosu::Bitmap Gosu::load_image_file(Reader input)
43
+ Gosu::Bitmap Gosu::load_image(const Buffer& buffer)
70
44
  {
71
- bool needs_color_key = is_bmp(input);
72
-
73
- stbi_io_callbacks callbacks{};
74
- callbacks.read = read_callback;
75
- callbacks.skip = skip_callback;
76
- callbacks.eof = eof_callback;
77
45
  int x = 0, y = 0, n = 0;
78
-
79
- stbi_uc* bytes = stbi_load_from_callbacks(&callbacks, &input, &x, &y, &n, STBI_rgb_alpha);
46
+ stbi_uc* bytes = stbi_load_from_memory(buffer.data(), static_cast<int>(buffer.size()), &x, &y,
47
+ &n, STBI_rgb_alpha);
80
48
  if (bytes == nullptr) {
81
- throw std::runtime_error{"Cannot load image: " + std::string(stbi_failure_reason())};
49
+ throw std::runtime_error("Cannot load image: " + std::string(stbi_failure_reason()));
82
50
  }
83
51
 
84
- Gosu::Bitmap bitmap{x, y};
85
- std::memcpy(bitmap.data(), bytes, x * y * sizeof(Gosu::Color));
86
-
87
- stbi_image_free(bytes);
52
+ int pixels = x * y;
53
+ Buffer pixel_buffer(bytes, static_cast<std::size_t>(pixels) * sizeof(Color), &stbi_image_free);
54
+ Gosu::Bitmap bitmap(x, y, std::move(pixel_buffer));
88
55
 
89
- if (needs_color_key) {
90
- apply_color_key(bitmap, Gosu::Color::FUCHSIA);
56
+ // If we just read a BMP file, we want to apply a color key.
57
+ if (buffer.size() > 2 && buffer.data()[0] == 'B' && buffer.data()[1] == 'M') {
58
+ bitmap.apply_color_key(Gosu::Color::FUCHSIA);
91
59
  }
60
+
92
61
  return bitmap;
93
62
  }
94
63
 
@@ -101,10 +70,11 @@ void Gosu::save_image_file(const Gosu::Bitmap& bitmap, const std::string& filena
101
70
 
102
71
  if (has_extension(filename, "bmp")) {
103
72
  ok = stbi_write_bmp(filename.c_str(), bitmap.width(), bitmap.height(), 3,
104
- bitmap_to_rgb(bitmap).data());
73
+ remove_alpha_channel(bitmap).data());
105
74
  }
106
- else if (has_extension(filename, "tga")) {
107
- ok = stbi_write_tga(filename.c_str(), bitmap.width(), bitmap.height(), 4, bitmap.data());
75
+ else if (has_extension(filename, "jpg") || has_extension(filename, "jpeg")) {
76
+ ok = stbi_write_jpg(filename.c_str(), bitmap.width(), bitmap.height(), 3,
77
+ remove_alpha_channel(bitmap).data(), JPEG_QUALITY);
108
78
  }
109
79
  else {
110
80
  ok = stbi_write_png(filename.c_str(), bitmap.width(), bitmap.height(), 4, bitmap.data(), 0);
@@ -115,32 +85,36 @@ void Gosu::save_image_file(const Gosu::Bitmap& bitmap, const std::string& filena
115
85
  }
116
86
  }
117
87
 
118
- static void stbi_write_to_writer(void* context, void* data, int size)
119
- {
120
- static_cast<Gosu::Writer*>(context)->write(data, size);
121
- }
122
-
123
- void Gosu::save_image_file(const Gosu::Bitmap& bitmap, Gosu::Writer writer,
124
- const std::string_view& format_hint)
88
+ Gosu::Buffer Gosu::save_image(const Gosu::Bitmap& bitmap, std::string_view format_hint)
125
89
  {
90
+ const auto stbi_write_to_vector = [](void* context, void* data, int size) {
91
+ auto* vec = static_cast<std::vector<std::uint8_t>*>(context);
92
+ const auto* begin = static_cast<const std::uint8_t*>(data);
93
+ const auto* end = begin + size;
94
+ vec->insert(vec->end(), begin, end);
95
+ };
96
+
97
+ std::vector<std::uint8_t> vector;
126
98
  int ok;
127
99
 
128
- if (has_extension(format_hint, "bmp")) {
129
- ok = stbi_write_bmp_to_func(stbi_write_to_writer, &writer, bitmap.width(), bitmap.height(),
130
- 3, bitmap_to_rgb(bitmap).data());
100
+ if (format_hint == "bmp" || has_extension(format_hint, "bmp")) {
101
+ ok = stbi_write_bmp_to_func(stbi_write_to_vector, &vector, bitmap.width(), bitmap.height(),
102
+ 3, remove_alpha_channel(bitmap).data());
131
103
  }
132
- else if (has_extension(format_hint, "tga")) {
133
- stbi_write_tga_with_rle = 0;
134
- ok = stbi_write_tga_to_func(stbi_write_to_writer, &writer, bitmap.width(), bitmap.height(),
135
- 4, bitmap.data());
104
+ else if (format_hint == "jpg" || format_hint == "jpeg" || has_extension(format_hint, "jpg")
105
+ || has_extension(format_hint, "jpeg")) {
106
+ ok = stbi_write_jpg_to_func(stbi_write_to_vector, &vector, bitmap.width(), bitmap.height(),
107
+ 3, remove_alpha_channel(bitmap).data(), JPEG_QUALITY);
136
108
  }
137
109
  else {
138
- ok = stbi_write_png_to_func(stbi_write_to_writer, &writer, bitmap.width(), bitmap.height(),
110
+ ok = stbi_write_png_to_func(stbi_write_to_vector, &vector, bitmap.width(), bitmap.height(),
139
111
  4, bitmap.data(), 0);
140
112
  }
141
113
 
142
114
  if (ok == 0) {
143
- throw std::runtime_error("Could not save image data to memory (format hint = '" +
144
- std::string{format_hint} + "'");
115
+ throw std::runtime_error("Could not save image data to memory (format hint = '"
116
+ + std::string(format_hint) + "'");
145
117
  }
118
+
119
+ return Buffer(std::move(vector));
146
120
  }