diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/emu/rendutil.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/emu/rendutil.cpp')
-rw-r--r-- | src/emu/rendutil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp index 6d0bde63adb..4c49c6c8a62 100644 --- a/src/emu/rendutil.cpp +++ b/src/emu/rendutil.cpp @@ -540,8 +540,8 @@ bool render_load_png(bitmap_argb32 &bitmap, emu_file &file, const char *dirname, fname.assign(filename); else fname.assign(dirname).append(PATH_SEPARATOR).append(filename); - file_error filerr = file.open(fname.c_str()); - if (filerr != FILERR_NONE) + osd_file::error filerr = file.open(fname.c_str()); + if (filerr != osd_file::error::NONE) return false; // read the PNG data |