diff --git a/aegisub/ass_dialogue.cpp b/aegisub/ass_dialogue.cpp index 81bffcd24..2bccc0019 100644 --- a/aegisub/ass_dialogue.cpp +++ b/aegisub/ass_dialogue.cpp @@ -884,8 +884,8 @@ void AssDialogueBlockDrawing::MultiplyCoords(double x,double y) { if (cur.IsNumber()) { // Multiply it cur.ToLong(&temp); - if (isX) temp = temp*x + 0.5; - else temp = temp*y + 0.5; + if (isX) temp = long int(temp*x + 0.5); + else temp = long int(temp*y + 0.5); // Write back to list final += wxString::Format(_T("%i "),temp); diff --git a/aegisub/ass_file.cpp b/aegisub/ass_file.cpp index 711712474..5e6ce86f1 100644 --- a/aegisub/ass_file.cpp +++ b/aegisub/ass_file.cpp @@ -153,7 +153,6 @@ void AssFile::Save(wxString _filename,bool setfilename,bool addToRecent,const wx } wxString extension = _filename.substr(i+1); extension.Lower(); - bool success = false; // Get writer SubtitleFormat *writer = SubtitleFormat::GetWriter(_filename); @@ -447,10 +446,8 @@ AssFile::AssFile (AssFile &from) { filename = from.filename; loaded = from.loaded; Modified = from.Modified; - int version = 1; // Copy lines - int lasttime = -1; for (list::iterator cur=from.Line.begin();cur!=from.Line.end();cur++) { Line.push_back((*cur)->Clone()); } @@ -465,7 +462,7 @@ void AssFile::InsertStyle (AssStyle *style) { AssEntry *curEntry; list::iterator lastStyle = Line.end(); list::iterator cur; - int lasttime; + int lasttime = -1; wxString lastGroup; // Look for insert position diff --git a/aegisub/ass_override.cpp b/aegisub/ass_override.cpp index 9839685a3..1a47f5f31 100644 --- a/aegisub/ass_override.cpp +++ b/aegisub/ass_override.cpp @@ -672,6 +672,7 @@ end_tokenizing: newparam->SetBlock(temp); break; } + default: break; } // Get next actual parameter diff --git a/aegisub/ass_time.cpp b/aegisub/ass_time.cpp index af866cd99..86e005b4f 100644 --- a/aegisub/ass_time.cpp +++ b/aegisub/ass_time.cpp @@ -84,8 +84,8 @@ void AssTime::ParseASS (const wxString _text) { if (!temp.ToDouble(&ts_raw)) throw 0; // Split into seconds and fraction - ts = ts_raw; - tms = (ts_raw-ts)*1000+0.5; + ts = (long int)(ts_raw); + tms = (long int)((ts_raw-ts)*1000+0.5); } // Something went wrong, don't change anything diff --git a/aegisub/subs_grid.cpp b/aegisub/subs_grid.cpp index 29cd1d63f..b711947a7 100644 --- a/aegisub/subs_grid.cpp +++ b/aegisub/subs_grid.cpp @@ -1020,7 +1020,7 @@ void SubtitlesGrid::JoinAsKaraoke(int n1,int n2) { // Collect data AssDialogue *cur; int start,end; - int firststart; + int firststart = 0; int lastend = -1; int len1,len2; for (int i=n1;i<=n2;i++) { @@ -1154,7 +1154,7 @@ void SubtitlesGrid::SplitLine(int n,int pos,int mode) { // Modify time if (mode == 1) { double splitPos = double(pos)/orig.Length(); - int splitTime = (n1->End.GetMS() - n1->Start.GetMS())*splitPos + n1->Start.GetMS(); + int splitTime = (int)((n1->End.GetMS() - n1->Start.GetMS())*splitPos) + n1->Start.GetMS(); n1->End.SetMS(splitTime); n2->Start.SetMS(splitTime); } diff --git a/aegisub/subtitle_format_txt.cpp b/aegisub/subtitle_format_txt.cpp index 0828a816d..083244f5e 100644 --- a/aegisub/subtitle_format_txt.cpp +++ b/aegisub/subtitle_format_txt.cpp @@ -119,8 +119,8 @@ void TXTSubtitleFormat::ReadFile(wxString filename,wxString encoding) { using na // Read actor data if (!isComment && separator != _T("")) { if (value[0] != _T(' ') && value[0] != _T('\t')) { - size_t pos = value.Find(separator); - if (pos != -1) { + int pos = value.Find(separator); + if (pos != wxNOT_FOUND) { actor = value.Left(pos); actor.Trim(false); actor.Trim(true); diff --git a/aegisub/thesaurus_myspell.cpp b/aegisub/thesaurus_myspell.cpp index 6a495f26f..d79aba3db 100644 --- a/aegisub/thesaurus_myspell.cpp +++ b/aegisub/thesaurus_myspell.cpp @@ -107,7 +107,7 @@ wxArrayString MySpellThesaurus::GetLanguageList() { // For each idxtionary match, see if it can find the corresponding .dat for (unsigned int i=0;i