[Scummvm-git-logs] scummvm master -> 324cacf4d9c9fc540d78f550566c3548b01517d7

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f7f9ec25a7 AGS: Implement support for other image types
324cacf4d9 AGS: Remove unneeded packfile image stubs


Commit: f7f9ec25a7135702dd70f9fd5956c600452e1b46
    https://github.com/scummvm/scummvm/commit/f7f9ec25a7135702dd70f9fd5956c600452e1b46
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-07T09:37:33-08:00

Commit Message:
AGS: Implement support for other image types

Changed paths:
    engines/ags/shared/gfx/image.cpp


diff --git a/engines/ags/shared/gfx/image.cpp b/engines/ags/shared/gfx/image.cpp
index b29c6d8c61..605f0e94aa 100644
--- a/engines/ags/shared/gfx/image.cpp
+++ b/engines/ags/shared/gfx/image.cpp
@@ -26,7 +26,10 @@
 #include "common/str.h"
 #include "common/stream.h"
 #include "common/textconsole.h"
+#include "image/bmp.h"
+#include "image/iff.h"
 #include "image/pcx.h"
+#include "image/tga.h"
 
 namespace AGS3 {
 
@@ -74,11 +77,11 @@ BITMAP *load_tga_pf(PACKFILE *f, color *pal) {
 }
 
 BITMAP *load_bmp(const char *filename, color *pal) {
-	error("TODO: load_bmp");
+	return decodeImage<Image::BitmapDecoder>(filename, pal);
 }
 
 BITMAP *load_lbm(const char *filename, color *pal) {
-	error("TODO: load_lbm");
+	return decodeImage<Image::IFFDecoder>(filename, pal);
 }
 
 BITMAP *load_pcx(const char *filename, color *pal) {
@@ -86,7 +89,7 @@ BITMAP *load_pcx(const char *filename, color *pal) {
 }
 
 BITMAP *load_tga(const char *filename, color *pal) {
-	error("TODO: load_tga");
+	return decodeImage<Image::TGADecoder>(filename, pal);
 }
 
 BITMAP *load_bitmap(const char *filename, color *pal) {


Commit: 324cacf4d9c9fc540d78f550566c3548b01517d7
    https://github.com/scummvm/scummvm/commit/324cacf4d9c9fc540d78f550566c3548b01517d7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-07T09:37:33-08:00

Commit Message:
AGS: Remove unneeded packfile image stubs

Changed paths:
    engines/ags/shared/gfx/image.cpp
    engines/ags/shared/gfx/image.h


diff --git a/engines/ags/shared/gfx/image.cpp b/engines/ags/shared/gfx/image.cpp
index 605f0e94aa..f1ad387fac 100644
--- a/engines/ags/shared/gfx/image.cpp
+++ b/engines/ags/shared/gfx/image.cpp
@@ -64,18 +64,6 @@ BITMAP *decodeImage(const char *filename, color *pal) {
 	}
 }
 
-BITMAP *load_bmp_pf(PACKFILE *f, color *pal) {
-	error("TODO: load_bmp_pf");
-}
-
-BITMAP *load_pcx_pf(PACKFILE *f, color *pal) {
-	error("TODO: load_pcx_pf");
-}
-
-BITMAP *load_tga_pf(PACKFILE *f, color *pal) {
-	error("TODO: load_tga_pf");
-}
-
 BITMAP *load_bmp(const char *filename, color *pal) {
 	return decodeImage<Image::BitmapDecoder>(filename, pal);
 }
diff --git a/engines/ags/shared/gfx/image.h b/engines/ags/shared/gfx/image.h
index 8af013a19d..5887922912 100644
--- a/engines/ags/shared/gfx/image.h
+++ b/engines/ags/shared/gfx/image.h
@@ -29,12 +29,9 @@ namespace AGS3 {
 
 BITMAP *load_bitmap(const char *filename, color *pal);
 BITMAP *load_bmp(const char *filename, color *pal);
-BITMAP *load_bmp_pf(PACKFILE *f, color *pal);
 BITMAP *load_lbm(const char *filename, color *pal);
 BITMAP *load_pcx(const char *filename, color *pal);
-BITMAP *load_pcx_pf(PACKFILE *f, color *pal);
 BITMAP *load_tga(const char *filename, color *pal);
-BITMAP *load_tga_pf(PACKFILE *f, color *pal);
 
 int save_bitmap(Common::WriteStream &out, BITMAP *bmp, const RGB *pal);