Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit c002ef9

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0-15.05.2019
2 parents 9142ab3 + 0b2cf31 commit c002ef9

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

‎docs/lcb/notes/22060.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [22060] Fix bug in canvas library that can result in Points being initialized with previously used values.

‎engine/src/mblhandlers.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ Exec_stat MCHandleStartTrackingSensor(void *p_context, MCParameter *p_parameters
10061006
{
10071007
MCAutoValueRef t_value;
10081008
MCAutoStringRef t_string;
1009-
p_parameters->eval(ctxt, &t_value);
1009+
p_parameters->eval_argument(ctxt, &t_value);
10101010
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
10111011
t_sensor = MCSensorTypeFromString(*t_string);
10121012
p_parameters = p_parameters->getnext();
@@ -1016,7 +1016,7 @@ Exec_stat MCHandleStartTrackingSensor(void *p_context, MCParameter *p_parameters
10161016
{
10171017
MCAutoValueRef t_value;
10181018
MCAutoBooleanRef t_bool;
1019-
p_parameters->eval(ctxt, &t_value);
1019+
p_parameters->eval_argument(ctxt, &t_value);
10201020
// PM-2015-03-11: [[ Bug 14855 ]] Evaluate correctly the second param
10211021
if (ctxt . ConvertToBoolean(*t_value, &t_bool))
10221022
t_loosely = MCValueIsEqualTo(*t_bool, kMCTrue);
@@ -1048,7 +1048,7 @@ Exec_stat MCHandleStopTrackingSensor(void *p_context, MCParameter *p_parameters)
10481048
{
10491049
MCAutoValueRef t_value;
10501050
MCAutoStringRef t_string;
1051-
p_parameters->eval(ctxt, &t_value);
1051+
p_parameters->eval_argument(ctxt, &t_value);
10521052
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
10531053
t_sensor = MCSensorTypeFromString(*t_string);
10541054
p_parameters = p_parameters->getnext();
@@ -1127,7 +1127,7 @@ Exec_stat MCHandleSensorReading(void *p_context, MCParameter *p_parameters)
11271127
{
11281128
MCAutoValueRef t_value;
11291129
MCAutoStringRef t_string;
1130-
p_parameters->eval(ctxt, &t_value);
1130+
p_parameters->eval_argument(ctxt, &t_value);
11311131
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
11321132
t_sensor = MCSensorTypeFromString(*t_string);
11331133
p_parameters = p_parameters->getnext();
@@ -1137,7 +1137,7 @@ Exec_stat MCHandleSensorReading(void *p_context, MCParameter *p_parameters)
11371137
{
11381138
MCAutoValueRef t_value;
11391139
MCAutoBooleanRef t_bool;
1140-
p_parameters->eval(ctxt, &t_value);
1140+
p_parameters->eval_argument(ctxt, &t_value);
11411141
// PM-2015-03-11: [[ Bug 14855 ]] Evaluate correctly the second param
11421142
if(ctxt . ConvertToBoolean(*t_value, &t_bool))
11431143
t_detailed = MCValueIsEqualTo(*t_bool, kMCTrue);
@@ -1269,7 +1269,7 @@ Exec_stat MCHandleSetHeadingCalibrationTimeout(void *p_context, MCParameter *p_p
12691269
{
12701270
MCAutoValueRef t_value;
12711271
MCAutoNumberRef t_number;
1272-
p_parameters->eval(ctxt, &t_value);
1272+
p_parameters->eval_argument(ctxt, &t_value);
12731273
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
12741274
t_timeout = MCNumberFetchAsInteger(*t_number);
12751275
}
@@ -1315,7 +1315,7 @@ Exec_stat MCHandleSensorAvailable(void *p_context, MCParameter *p_parameters)
13151315
{
13161316
MCAutoValueRef t_value;
13171317
MCAutoStringRef t_string;
1318-
p_parameters->eval(ctxt, &t_value);
1318+
p_parameters->eval_argument(ctxt, &t_value);
13191319
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_string);
13201320
t_sensor = MCSensorTypeFromString(*t_string);
13211321
p_parameters = p_parameters->getnext();
@@ -1384,7 +1384,7 @@ Exec_stat MCHandleSetLocationHistoryLimit(void *p_context, MCParameter *p_parame
13841384
return ES_NORMAL;
13851385

13861386
MCAutoValueRef t_value;
1387-
p_parameters->eval(ctxt, &t_value);
1387+
p_parameters->eval_argument(ctxt, &t_value);
13881388

13891389
uinteger_t t_limit = 0;
13901390
/* UNCHECKED */ ctxt . ConvertToUnsignedInteger(*t_value, t_limit);
@@ -1460,7 +1460,7 @@ Exec_stat MCHandleShowContact(void *context, MCParameter *p_parameters) // ABPer
14601460
{
14611461
MCAutoValueRef t_value;
14621462
MCAutoNumberRef t_number;
1463-
p_parameters->eval(ctxt, &t_value);
1463+
p_parameters->eval_argument(ctxt, &t_value);
14641464
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
14651465
t_contact_id = MCNumberFetchAsInteger(*t_number);
14661466
}
@@ -1513,7 +1513,7 @@ Exec_stat MCHandleGetContactData(void *context, MCParameter *p_parameters)
15131513
{
15141514
MCAutoValueRef t_value;
15151515
MCAutoNumberRef t_number;
1516-
p_parameters->eval(ctxt, &t_value);
1516+
p_parameters->eval_argument(ctxt, &t_value);
15171517
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
15181518
t_contact_id = MCNumberFetchAsInteger(*t_number);
15191519
}
@@ -1541,7 +1541,7 @@ Exec_stat MCHandleRemoveContact(void *context, MCParameter *p_parameters)
15411541
{
15421542
MCAutoValueRef t_value;
15431543
MCAutoNumberRef t_number;
1544-
p_parameters->eval(ctxt, &t_value);
1544+
p_parameters->eval_argument(ctxt, &t_value);
15451545
/* UNCHECKED */ ctxt . ConvertToNumber(*t_value, &t_number);
15461546
t_contact_id = MCNumberFetchAsInteger(*t_number);
15471547
}
@@ -1580,7 +1580,7 @@ Exec_stat MCHandleFindContact(void *context, MCParameter *p_parameters)
15801580
if (p_parameters)
15811581
{
15821582
MCAutoValueRef t_value;
1583-
p_parameters->eval(ctxt, &t_value);
1583+
p_parameters->eval_argument(ctxt, &t_value);
15841584
/* UNCHECKED */ ctxt . ConvertToString(*t_value, &t_contact_name);
15851585
}
15861586
ctxt.SetTheResultToEmpty();
@@ -1978,7 +1978,7 @@ Exec_stat MCHandleFindEvent(void *context, MCParameter *p_parameters)
19781978
{
19791979
MCAutoValueRef t_value;
19801980

1981-
if (p_parameters->eval(ctxt, &t_value)
1981+
if (p_parameters->eval_argument(ctxt, &t_value)
19821982
&& !MCValueIsEmpty(*t_value))
19831983
{
19841984
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_start_date);
@@ -1989,7 +1989,7 @@ Exec_stat MCHandleFindEvent(void *context, MCParameter *p_parameters)
19891989
{
19901990
MCAutoValueRef t_value;
19911991

1992-
if (p_parameters->eval(ctxt, &t_value)
1992+
if (p_parameters->eval_argument(ctxt, &t_value)
19931993
&& !MCValueIsEmpty(*t_value))
19941994
{
19951995
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_end_date);
@@ -2027,7 +2027,7 @@ Exec_stat MCHandleCreateLocalNotification (void *context, MCParameter *p_paramet
20272027
if (t_success && p_parameters != nil)
20282028
{
20292029
MCAutoValueRef t_value;
2030-
if (p_parameters->eval(ctxt, &t_value)
2030+
if (p_parameters->eval_argument(ctxt, &t_value)
20312031
&& !MCValueIsEmpty(*t_value))
20322032
{
20332033
t_success = MCD_convert_to_datetime(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, t_date);
@@ -3801,23 +3801,23 @@ Exec_stat MCHandlePickDate(void *context, MCParameter *p_parameters)
38013801
if (t_success && p_parameters != nil)
38023802
{
38033803
MCAutoValueRef t_value;
3804-
p_parameters->eval(ctxt, &t_value);
3804+
p_parameters->eval_argument(ctxt, &t_value);
38053805
t_success = ctxt . ConvertToString(*t_value, &t_current);
38063806
p_parameters = p_parameters->getnext();
38073807
}
38083808

38093809
if (t_success && p_parameters != nil)
38103810
{
38113811
MCAutoValueRef t_value;
3812-
p_parameters->eval(ctxt, &t_value);
3812+
p_parameters->eval_argument(ctxt, &t_value);
38133813
t_success = ctxt . ConvertToString(*t_value, &t_start);
38143814
p_parameters = p_parameters->getnext();
38153815
}
38163816

38173817
if (t_success && p_parameters != nil)
38183818
{
38193819
MCAutoValueRef t_value;
3820-
p_parameters->eval(ctxt, &t_value);
3820+
p_parameters->eval_argument(ctxt, &t_value);
38213821
t_success = ctxt . ConvertToString(*t_value, &t_end);
38223822
p_parameters = p_parameters->getnext();
38233823
}
@@ -3889,23 +3889,23 @@ Exec_stat MCHandlePickTime(void *context, MCParameter *p_parameters)
38893889
if (t_success && p_parameters != nil)
38903890
{
38913891
MCAutoValueRef t_value;
3892-
p_parameters->eval(ctxt, &t_value);
3892+
p_parameters->eval_argument(ctxt, &t_value);
38933893
t_success = ctxt . ConvertToString(*t_value, &t_current);
38943894
p_parameters = p_parameters->getnext();
38953895
}
38963896

38973897
if (t_success && p_parameters != nil)
38983898
{
38993899
MCAutoValueRef t_value;
3900-
p_parameters->eval(ctxt, &t_value);
3900+
p_parameters->eval_argument(ctxt, &t_value);
39013901
t_success = ctxt . ConvertToString(*t_value, &t_start);
39023902
p_parameters = p_parameters->getnext();
39033903
}
39043904

39053905
if (t_success && p_parameters != nil)
39063906
{
39073907
MCAutoValueRef t_value;
3908-
p_parameters->eval(ctxt, &t_value);
3908+
p_parameters->eval_argument(ctxt, &t_value);
39093909
t_success = ctxt . ConvertToString(*t_value, &t_end);
39103910
p_parameters = p_parameters->getnext();
39113911
}
@@ -3972,23 +3972,23 @@ Exec_stat MCHandlePickDateAndTime(void *context, MCParameter *p_parameters)
39723972
if (t_success && p_parameters != nil)
39733973
{
39743974
MCAutoValueRef t_value;
3975-
p_parameters->eval(ctxt, &t_value);
3975+
p_parameters->eval_argument(ctxt, &t_value);
39763976
t_success = ctxt . ConvertToString(*t_value, &t_current);
39773977
p_parameters = p_parameters->getnext();
39783978
}
39793979

39803980
if (t_success && p_parameters != nil)
39813981
{
39823982
MCAutoValueRef t_value;
3983-
p_parameters->eval(ctxt, &t_value);
3983+
p_parameters->eval_argument(ctxt, &t_value);
39843984
t_success = ctxt . ConvertToString(*t_value, &t_start);
39853985
p_parameters = p_parameters->getnext();
39863986
}
39873987

39883988
if (t_success && p_parameters != nil)
39893989
{
39903990
MCAutoValueRef t_value;
3991-
p_parameters->eval(ctxt, &t_value);
3991+
p_parameters->eval_argument(ctxt, &t_value);
39923992
t_success = ctxt . ConvertToString(*t_value, &t_end);
39933993
p_parameters = p_parameters->getnext();
39943994
}
@@ -4242,7 +4242,7 @@ Exec_stat MCHandleControlSet(void *context, MCParameter *p_parameters)
42424242

42434243
MCAutoValueRef t_value;
42444244
if (t_success && p_parameters != nil)
4245-
t_success = p_parameters -> eval(ctxt, &t_value);
4245+
t_success = p_parameters -> eval_argument(ctxt, &t_value);
42464246

42474247
if (t_success)
42484248
MCNativeControlExecSet(ctxt, *t_control_name, *t_property, *t_value);
@@ -4295,7 +4295,7 @@ Exec_stat MCHandleControlDo(void *context, MCParameter *p_parameters)
42954295
MCValueRef t_value;
42964296
while (t_success && p_parameters != nil)
42974297
{
4298-
p_parameters -> eval(ctxt, t_value);
4298+
p_parameters -> eval_argument(ctxt, t_value);
42994299
t_success = t_params . Push(t_value);
43004300
p_parameters = p_parameters -> getnext();
43014301
}

‎engine/src/module-canvas.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ static bool __MCCanvasPointEqual(MCValueRef p_left, MCValueRef p_right)
846846
if (p_left == p_right)
847847
return true;
848848

849-
return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_left), sizeof(__MCCanvasPointImpl)) == 0;
849+
return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_right), sizeof(__MCCanvasPointImpl)) == 0;
850850
}
851851

852852
static hash_t __MCCanvasPointHash(MCValueRef p_value)

0 commit comments

Comments
 (0)