diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/tools/ldresample.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/tools/ldresample.cpp')
| -rw-r--r-- | src/tools/ldresample.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/ldresample.cpp b/src/tools/ldresample.cpp index d22fcd7a4a9..771c4e94676 100644 --- a/src/tools/ldresample.cpp +++ b/src/tools/ldresample.cpp @@ -248,7 +248,7 @@ static bool read_chd(chd_file &file, UINT32 field, movie_info &info, UINT32 soun file.codec_configure(CHD_CODEC_AVHUFF, AVHUFF_CODEC_DECOMPRESS_CONFIG, &avconfig); // read the field - chd_error chderr = file.read_hunk(field, NULL); + chd_error chderr = file.read_hunk(field, nullptr); return (chderr == CHDERR_NONE); } @@ -508,13 +508,13 @@ int main(int argc, char *argv[]) if (argc < 2) return usage(); const char *srcfilename = argv[1]; - const char *dstfilename = (argc < 3) ? NULL : argv[2]; + const char *dstfilename = (argc < 3) ? nullptr : argv[2]; double offset = (argc < 4) ? 0.0 : atof(argv[3]); double slope = (argc < 5) ? 1.0 : atof(argv[4]); // print basic information printf("Input file: %s\n", srcfilename); - if (dstfilename != NULL) + if (dstfilename != nullptr) { printf("Output file: %s\n", dstfilename); printf("Offset: %f\n", offset); @@ -538,7 +538,7 @@ int main(int argc, char *argv[]) printf("Total fields: %d\n", info.numfields); // if we don't have a destination file, scan for edges - if (dstfilename == NULL) + if (dstfilename == nullptr) { for (UINT32 fieldnum = 60; fieldnum < info.numfields - 60; fieldnum += 30) { @@ -554,7 +554,7 @@ int main(int argc, char *argv[]) // open the destination file chd_resample_compressor dstfile(srcfile, info, INT64(offset * 65536.0 * 256.0), INT64(slope * 65536.0 * 256.0)); err = create_chd(dstfile, dstfilename, srcfile, info); - if (dstfile == NULL) + if (dstfile == nullptr) { fprintf(stderr, "Unable to create file '%s'\n", dstfilename); return 1; |
