From 9767b715caa0fa4b497a264ae7b274a6d45a47c8 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 2 Jun 2010 07:22:59 +0000 Subject: [PATCH] Explicitly initialize VisualToolScale's members Originally committed to SVN as r4402. --- aegisub/src/visual_tool_scale.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp index 012425966..0219f1886 100644 --- a/aegisub/src/visual_tool_scale.cpp +++ b/aegisub/src/visual_tool_scale.cpp @@ -51,6 +51,14 @@ /// @param _parent VisualToolScale::VisualToolScale(VideoDisplay *parent, VideoState const& video, wxToolBar *) : VisualTool(parent, video) +, curScaleX(0.f) +, startScaleX(0.f) +, origScaleX(0.f) +, curScaleY(0.f) +, startScaleY(0.f) +, origScaleY(0.f) +, startX(0) +, startY(0) { } @@ -130,8 +138,8 @@ bool VisualToolScale::InitializeHold() { GetLineScale(curDiag,origScaleX,origScaleY); curScaleX = origScaleX; curScaleY = origScaleY; - curDiag->StripTag(_T("\\fscx")); - curDiag->StripTag(_T("\\fscy")); + curDiag->StripTag(L"\\fscx"); + curDiag->StripTag(L"\\fscy"); return true; } @@ -160,7 +168,7 @@ void VisualToolScale::UpdateHold() { /// @brief Commit hold void VisualToolScale::CommitHold() { - SetOverride(GetActiveDialogueLine(), _T("\\fscx"),wxString::Format(L"(%0.3g)",curScaleX)); - SetOverride(GetActiveDialogueLine(), _T("\\fscy"),wxString::Format(L"(%0.3g)",curScaleY)); + SetOverride(GetActiveDialogueLine(), L"\\fscx",wxString::Format(L"(%0.3g)",curScaleX)); + SetOverride(GetActiveDialogueLine(), L"\\fscy",wxString::Format(L"(%0.3g)",curScaleY)); }