commit 6c2067546da15ea254b71dd5df82e4b976c53a89
parent 98df8a91e0ab3ff0d68d2e8349b47c7b101b743c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Tue, 14 Mar 2017 11:14:43 +0100
Remove useless field; slight improvement.
Diffstat:
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/ssol_estimator_c.h b/src/ssol_estimator_c.h
@@ -233,7 +233,6 @@ mc_receiver_copy_and_release
struct mc_sampled {
/* Global data for this entity */
struct mc_data shadowed;
- double area;
double sun_cos;
size_t nb_samples;
@@ -248,7 +247,6 @@ mc_sampled_init
{
ASSERT(samp);
samp->shadowed = MC_DATA_NULL;
- samp->area = 0;
samp->sun_cos = 0;
samp->nb_samples = 0;
htable_receiver_init(allocator, &samp->mc_rcvs);
@@ -266,7 +264,6 @@ mc_sampled_copy(struct mc_sampled* dst, const struct mc_sampled* src)
{
ASSERT(dst && src);
dst->shadowed = src->shadowed;
- dst->area = src->area;
dst->sun_cos = src->sun_cos;
dst->nb_samples = src->nb_samples;
return htable_receiver_copy(&dst->mc_rcvs, &src->mc_rcvs);
@@ -277,7 +274,6 @@ mc_sampled_copy_and_release(struct mc_sampled* dst, struct mc_sampled* src)
{
ASSERT(dst && src);
dst->shadowed = src->shadowed;
- dst->area = src->area;
dst->sun_cos = src->sun_cos;
dst->nb_samples = src->nb_samples;
return htable_receiver_copy_and_release(&dst->mc_rcvs, &src->mc_rcvs);
@@ -395,21 +391,20 @@ get_mc_sampled
struct mc_sampled** out_mc_samp)
{
struct mc_sampled* mc_samp = NULL;
- struct mc_sampled mc_samp_null;
res_T res = RES_OK;
ASSERT(sampled && inst && out_mc_samp);
- mc_sampled_init(inst->dev->allocator, &mc_samp_null);
-
mc_samp = htable_sampled_find(sampled, &inst);
if(!mc_samp) {
+ struct mc_sampled mc_samp_null;
+ mc_sampled_init(inst->dev->allocator, &mc_samp_null);
res = htable_sampled_set(sampled, &inst, &mc_samp_null);
+ mc_sampled_release(&mc_samp_null);
if(res != RES_OK) goto error;
mc_samp = htable_sampled_find(sampled, &inst);
}
exit:
- mc_sampled_release(&mc_samp_null);
*out_mc_samp = mc_samp;
return res;
error: