diff options
author | Kacper Michajłow <kasper93@gmail.com> | 2016-06-05 16:52:50 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-08 13:39:06 +0300 |
commit | bb71e60a67aff17369c0625c606985366e812e94 (patch) | |
tree | cd0325cc4bb87c03da53bc8c66cae3ff6b350cc2 /demuxer | |
parent | e0a2821e6f1c9a20a47c010b1967d22c1ba14cbb (diff) |
Be consistent about data types to fix few compiler warnings.
- Add cast to DWORD type when needed. Optionaly GrowableArray API could be
changed to use size_t but this would require changes across the
codebase to fix all usages.
Diffstat (limited to 'demuxer')
-rw-r--r-- | demuxer/Demuxers/BDDemuxer.cpp | 8 | ||||
-rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/demuxer/Demuxers/BDDemuxer.cpp b/demuxer/Demuxers/BDDemuxer.cpp index 4acea18d..edcefa34 100644 --- a/demuxer/Demuxers/BDDemuxer.cpp +++ b/demuxer/Demuxers/BDDemuxer.cpp @@ -604,13 +604,13 @@ void CBDDemuxer::ProcessBluRayMetadata() pg_sequences.sort(); pg_sequences.unique(); - int size = pg_sequences.size() * 4; + size_t size = pg_sequences.size() * 4; char *offsets = new char[size]; offsets[0] = 0; // Append all offsets to the string for (auto it = pg_sequences.begin(); it != pg_sequences.end(); it++) { - int len = strlen(offsets); + size_t len = strlen(offsets); if (len > 0) { offsets[len] = ','; len++; @@ -635,13 +635,13 @@ void CBDDemuxer::ProcessBluRayMetadata() // strip duplicate entries ig_sequences.unique(); - int size = ig_sequences.size() * 4; + size_t size = ig_sequences.size() * 4; char *offsets = new char[size]; offsets[0] = 0; // Append all offsets to the string for (auto it = ig_sequences.begin(); it != ig_sequences.end(); it++) { - int len = strlen(offsets); + size_t len = strlen(offsets); if (len > 0) { offsets[len] = ','; len++; diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp index df2c811e..2afd77b9 100644 --- a/demuxer/Demuxers/LAVFDemuxer.cpp +++ b/demuxer/Demuxers/LAVFDemuxer.cpp @@ -2092,13 +2092,13 @@ STDMETHODIMP CLAVFDemuxer::CreateStreams() pg_sequences.sort(); pg_sequences.unique(); - int size = pg_sequences.size() * 4; + size_t size = pg_sequences.size() * 4; char *offsets = new char[size]; offsets[0] = 0; // Append all offsets to the string for (auto it = pg_sequences.begin(); it != pg_sequences.end(); it++) { - int len = strlen(offsets); + size_t len = strlen(offsets); if (len > 0) { offsets[len] = ','; len++; |