Skip to content

Commit 50430b5

Browse files
committed
textures: Use libpng from pspsdk and update libnsbmp to 0.17
1 parent 81e988e commit 50430b5

7 files changed

Lines changed: 10 additions & 4108 deletions

File tree

app/source/screenshot.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#include <cstdio>
2+
#include <png.h>
23
#include <pspdisplay.h>
34
#include <pspiofilemgr.h>
4-
#include <psptypes.h>
5-
#include <sys/time.h>
65
#include <psprtc.h>
76
#include <string>
87

98
#include "fs.h"
10-
#include "libpng/png.h"
119
#include "utils.h"
1210

1311
namespace Screenshot {

app/source/textures.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include <cstdio>
33
#include <cstring>
44
#include <jpeglib.h>
5+
#include <png.h>
56

67
#include "fs.h"
78
#include "libnsbmp.h"
89
#include "libnsgif.h"
9-
#include "libpng/png.h"
1010
#include "log.h"
1111
#include "textures.h"
1212
#include "utils.h"
@@ -96,10 +96,6 @@ namespace Image {
9696
assert(bitmap);
9797
std::free(bitmap);
9898
}
99-
100-
static size_t GetBPP([[maybe_unused]] void *bitmap) {
101-
return BYTES_PER_PIXEL;
102-
}
10399

104100
static void Modified([[maybe_unused]] void *bitmap) {
105101
assert(bitmap);
@@ -112,8 +108,7 @@ namespace Textures {
112108
bmp_bitmap_callback_vt bitmap_callbacks = {
113109
Image::Create,
114110
Image::Destroy,
115-
Image::GetBuffer,
116-
Image::GetBPP
111+
Image::GetBuffer
117112
};
118113

119114
bmp_result code = BMP_OK;

0 commit comments

Comments
 (0)