notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.40a fixes, pt2
[picodrive.git]
/
platform
/
common
/
readpng.c
diff --git
a/platform/common/readpng.c
b/platform/common/readpng.c
index
2a74668
..
c93b36f
100644
(file)
--- a/
platform/common/readpng.c
+++ b/
platform/common/readpng.c
@@
-4,6
+4,14
@@
#include "readpng.h"
#include "lprintf.h"
#include "readpng.h"
#include "lprintf.h"
+#ifdef PSP
+#define BG_WIDTH 480
+#define BG_HEIGHT 272
+#else
+#define BG_WIDTH 320
+#define BG_HEIGHT 240
+#endif
+
void readpng(void *dest, const char *fname, readpng_what what)
{
FILE *fp;
void readpng(void *dest, const char *fname, readpng_what what)
{
FILE *fp;
@@
-62,9
+70,9
@@
void readpng(void *dest, const char *fname, readpng_what what)
break;
}
height = info_ptr->height;
break;
}
height = info_ptr->height;
- if (height >
240) height = 240
;
+ if (height >
BG_HEIGHT) height = BG_HEIGHT
;
width = info_ptr->width;
width = info_ptr->width;
- if (width >
320) width = 320
;
+ if (width >
BG_WIDTH) width = BG_WIDTH
;
for (h = 0; h < height; h++)
{
for (h = 0; h < height; h++)
{
@@
-72,10
+80,14
@@
void readpng(void *dest, const char *fname, readpng_what what)
int len = width;
while (len--)
{
int len = width;
while (len--)
{
- *dst++ = ((src[0]&0xf8)<<8) | ((src[1]&0xf8)<<3) | (src[2] >> 3);
+#ifdef PSP
+ *dst++ = ((src[2]&0xf8)<<8) | ((src[1]&0xf8)<<3) | (src[0] >> 3); // BGR
+#else
+ *dst++ = ((src[0]&0xf8)<<8) | ((src[1]&0xf8)<<3) | (src[2] >> 3); // RGB
+#endif
src += 3;
}
src += 3;
}
- dst +=
320
- width;
+ dst +=
BG_WIDTH
- width;
}
break;
}
}
break;
}