notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweak and refactor frontends, menu and config
[libpicofe.git]
/
win32
/
main.c
diff --git
a/win32/main.c
b/win32/main.c
index
d43149c
..
cf2523a
100644
(file)
--- a/
win32/main.c
+++ b/
win32/main.c
@@
-107,7
+107,7
@@
static HBITMAP png2hb(const char *fname, int is_480)
\r
bmem = calloc(1, is_480 ? 480*240*3 : 320*240*3);
\r
if (bmem == NULL) return NULL;
\r
\r
bmem = calloc(1, is_480 ? 480*240*3 : 320*240*3);
\r
if (bmem == NULL) return NULL;
\r
- ret = readpng(bmem, fname,
is_480 ? READPNG_480_24 : READPNG_320_24
);
\r
+ ret = readpng(bmem, fname,
READPNG_24, is_480 ? 480 : 320, 240
);
\r
if (ret != 0) {
\r
free(bmem);
\r
return NULL;
\r
if (ret != 0) {
\r
free(bmem);
\r
return NULL;
\r
@@
-566,7
+566,7
@@
void xxinit(void)
/* in_init() must go before config, config accesses in_ fwk */
\r
in_init();
\r
emu_prep_defconfig();
\r
/* in_init() must go before config, config accesses in_ fwk */
\r
in_init();
\r
emu_prep_defconfig();
\r
- emu_read_config(
0
, 0);
\r
+ emu_read_config(
NULL
, 0);
\r
config_readlrom(PicoConfigFile);
\r
\r
plat_init();
\r
config_readlrom(PicoConfigFile);
\r
\r
plat_init();
\r