Mercurial > hg > svgui
comparison layer/TimeValueLayer.cpp @ 898:2be9753651c8 cxx11
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 09 Feb 2015 10:31:07 +0000 |
| parents | 33157c3f0e80 |
| children | 4a578a360011 |
comparison
equal
deleted
inserted
replaced
| 879:899c4d7e7e63 | 898:2be9753651c8 |
|---|---|
| 1149 | 1149 |
| 1150 // // or | 1150 // // or |
| 1151 // path.quadTo(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2); | 1151 // path.quadTo(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2); |
| 1152 | 1152 |
| 1153 } else { | 1153 } else { |
| 1154 path.lineTo(x0, y0); | |
| 1154 path.lineTo((x0 + x1) / 2, (y0 + y1) / 2); | 1155 path.lineTo((x0 + x1) / 2, (y0 + y1) / 2); |
| 1155 } | 1156 } |
| 1156 } | 1157 } |
| 1157 } | 1158 } |
| 1158 } | 1159 } |