test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 02:58:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix ti compile error

Browse Source
This commit is contained in:
xianjimli 2020-04-02 16:57:34 +08:00
parent 184087861e
commit 29aaf118be
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rd/agge/agge/stroke_features.h
View File

@ -1,6 +1,7 @@
#pragma once
#include "stroke.h"
#include <math.h>
namespace agge
{

28
3rd/agge/agge/vector_rasterizer.cpp
View File

@ -160,8 +160,8 @@ namespace agge
const int fy1 = y1 & _1_mask;
const int fy2 = y2 & _1_mask;
const int step = dy > 0 ? +1 : -1;
const int near = dy > 0 ? _1 : 0;
const int far = _1 - near;
const int near_ = dy > 0 ? _1 : 0;
const int far_ = _1 - near_;
if (x2 == x1)
{
@ -173,12 +173,12 @@ namespace agge
const int two_fx = 2 * (x1 & _1_mask);
jump_xy(current, ex1, ey1);
add_and_commit(current, two_fx, near - fy1);
add_and_commit(current, two_fx, near_ - fy1);
ey1 += step;
if (ey1 != ey2)
{
const int inner_delta = near - far, inner_area = two_fx * inner_delta;
const int inner_delta = near_ - far_, inner_area = two_fx * inner_delta;
do
{
@ -186,13 +186,13 @@ namespace agge
ey1 += step;
} while (ey1 != ey2);
}
set(current, ex1, ey1, two_fx, fy2 - far);
set(current, ex1, ey1, two_fx, fy2 - far_);
}
else
{
// Ok, we have to render several hlines.
const int lift = near - fy1;
const int lift = near_ - fy1;
precise_delta ctg_delta(dx, dy), tg_delta(dy, dx);
ctg_delta.multiply(lift);
@ -205,7 +205,7 @@ namespace agge
if (ey1 != ey2)
{
const int lift_full = near - far;
const int lift_full = near_ - far_;
ctg_delta.multiply(lift_full);
@ -217,7 +217,7 @@ namespace agge
ey1 += step;
} while (ey1 != ey2);
}
if (int dy_rest = fy2 - far)
if (int dy_rest = fy2 - far_)
hline(current, tg_delta, ey1, x_to, x2, dy_rest);
}
}
@ -320,19 +320,19 @@ namespace agge
// Ok, we'll have to render a run of adjacent cells on the same hline...
const int step = x2 > x1 ? +1 : -1;
const int near = x2 > x1 ? _1 : 0;
const int far = _1 - near;
const int near_ = x2 > x1 ? _1 : 0;
const int far_ = _1 - near_;
tg_delta.multiply(near - fx1);
tg_delta.multiply(near_ - fx1);
int y_to = tg_delta.next();
add_and_commit(current, fx1 + near, y_to);
add_and_commit(current, fx1 + near_, y_to);
ex1 += step;
if (ex1 != ex2)
{
tg_delta.multiply(near - far);
tg_delta.multiply(near_ - far_);
do
{
@ -344,7 +344,7 @@ namespace agge
ex1 += step;
} while (ex1 != ex2);
}
set(current, ex1, ey, fx2 + far, dy - y_to);
set(current, ex1, ey, fx2 + far_, dy - y_to);
}
}

2
docs/changes.md
View File

@ -1,6 +1,8 @@
# 最新动态
* 2020/04/02
* 增加 waitable ring buffer
* 修改资源的问题（感谢陈谭提供补丁）。
* 修改 ti 编译器的问题（感谢陈谭提供补丁）。
* 2020/04/01
* 修正 overlay 的注释（感谢大恒提供补丁）。

4
src/tkc/value_desc.h
View File

@ -660,11 +660,11 @@ typedef struct _value_desc_double_t {
*/
double max;
/**
* @property {double_t} step
* @property {double} step
* @annotation ["readable"]
* 步长。
*/
double_t step;
double step;
/**
* @property {const char*} unit
* @annotation ["readable"]