[librpbase] RpImageLoader: Take IRpFile* and make the IRpFilePtr vers…

…ion a wrapper. Similar to RpJpeg and RpPng, which are both used by RpImageLoader.
GerbilSoft · Nov 24, 2024 · c885930 · c885930
1 parent 0ec0b76
commit c885930
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/librpbase/img/RpImageLoader.cpp b/src/librpbase/img/RpImageLoader.cpp
@@ -48,7 +48,7 @@ static constexpr array<uint8_t, 4> exif_magic = {{'E','x','i','f'}};
  * @param file IRpFile to load from.
  * @return rp_image*, or nullptr on error.
  */
-rp_image_ptr load(const IRpFilePtr &file)
+rp_image_ptr load(IRpFile *file)
 {
 	file->rewind();
 

diff --git a/src/librpbase/img/RpImageLoader.hpp b/src/librpbase/img/RpImageLoader.hpp
@@ -22,6 +22,16 @@ namespace LibRpBase { namespace RpImageLoader {
  * @return rp_image*, or nullptr on error.
  */
 RP_LIBROMDATA_PUBLIC
-LibRpTexture::rp_image_ptr load(const LibRpFile::IRpFilePtr &file);
+LibRpTexture::rp_image_ptr load(LibRpFile::IRpFile *file);
+
+/**
+ * Load an image from an IRpFile.
+ * @param file IRpFile to load from.
+ * @return rp_image*, or nullptr on error.
+ */
+LibRpTexture::rp_image_ptr load(const LibRpFile::IRpFilePtr &file)
+{
+	return load(file.get());
+}
 
 } }