iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

assdraw: eliminate some variable shadowing 

Originally committed to SVN as r6871.
This commit is contained in:
Thomas Goyne 2012-05-26 16:54:42 +00:00
parent 618c4b8afa
commit e368b068e4
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/assdraw/src/canvas.cpp
View File

@ -1790,13 +1790,13 @@ void ASSDrawCanvas::UpdateNonUniformTransformation()
rectbound2[3].x, rectbound2[3].y }; rectbound2[3].x, rectbound2[3].y };
agg::path_storage trans; agg::path_storage trans;
unsigned vertices = backupcmds.total_vertices(); unsigned vertices = backupcmds.total_vertices();
double x, y;
agg::trans_bilinear trans_b(rectbound[0].x, rectbound[0].y, rectbound[2].x, rectbound[2].y, bound); agg::trans_bilinear trans_b(rectbound[0].x, rectbound[0].y, rectbound[2].x, rectbound[2].y, bound);
agg::conv_transform<agg::path_storage, agg::trans_bilinear> transb(backupcmds, trans_b); agg::conv_transform<agg::path_storage, agg::trans_bilinear> transb(backupcmds, trans_b);
transb.rewind(0); transb.rewind(0);
for (int i = 0; i < vertices; i++) for (int i = 0; i < vertices; i++)
{ {
double x, y;
transb.vertex(&x, &y); transb.vertex(&x, &y);
trans.move_to(x, y); trans.move_to(x, y);
} }
@ -1825,7 +1825,6 @@ void ASSDrawCanvas::UpdateNonUniformTransformation()
void ASSDrawCanvas::CustomOnKeyDown(wxKeyEvent &event) void ASSDrawCanvas::CustomOnKeyDown(wxKeyEvent &event)
{ {
int keycode = event.GetKeyCode(); int keycode = event.GetKeyCode();
//m_frame->SetStatusText(wxString::Format(_T("Key: %d"), keycode));
double scrollamount = (event.GetModifiers() == wxMOD_CMD? 10.0:1.0); double scrollamount = (event.GetModifiers() == wxMOD_CMD? 10.0:1.0);
if (event.GetModifiers() == wxMOD_SHIFT) if (event.GetModifiers() == wxMOD_SHIFT)
{ {
@ -1905,15 +1904,11 @@ void ASSDrawCanvas::CustomOnKeyDown(wxKeyEvent &event)
else else
{ {
Point *warpto = NULL; Point *warpto = NULL;
if (pointedAt_point->type == MP) if (pointedAt_point->type == MP && pointedAt_point->cmd_next)
{ if (pointedAt_point->cmd_next->controlpoints.size() > 0)
if (pointedAt_point->cmd_next != NULL) warpto = pointedAt_point->cmd_next->controlpoints.front();
{ else
if (pointedAt_point->cmd_next->controlpoints.size() > 0) warpto = pointedAt_point->cmd_next->m_point;
warpto = pointedAt_point->cmd_next->controlpoints.front();
else
warpto = pointedAt_point->cmd_next->m_point;
}
} }
else else
{ {