summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/ldresample.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/tools/ldresample.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/tools/ldresample.cpp')
-rw-r--r--src/tools/ldresample.cpp10
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;