liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: 159f9e7014f8

Browse Source
This commit is contained in:
Oliver Duis
2012-05-06 23:04:47 +02:00
parent 1483ecb47c
commit 05226a2875
125 changed files with 747 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/klt/klt.cc
View File

@@ -160,7 +160,7 @@ KLT_FeatureList KLTCreateFeatureList(
fl->nFeatures = nFeatures;
/* Set pointers */
fl->feature = reinterpret_cast<KLT_Feature *>(fl + 1);
fl->feature = (KLT_Feature *) (fl + 1);
first = (KLT_Feature) (fl->feature + nFeatures);
for (i = 0 ; i < nFeatures ; i++) {
fl->feature[i] = first + i;
@@ -195,7 +195,7 @@ KLT_FeatureHistory KLTCreateFeatureHistory(
fh->nFrames = nFrames;
/* Set pointers */
fh->feature = reinterpret_cast<KLT_Feature *>(fh + 1);
fh->feature = (KLT_Feature *) (fh + 1);
first = (KLT_Feature) (fh->feature + nFrames);
for (i = 0 ; i < nFrames ; i++)
fh->feature[i] = first + i;

2
rtengine/klt/pyramid.cc
View File

@@ -51,7 +51,7 @@ _KLT_Pyramid _KLTCreatePyramid(
/* Set parameters */
pyramid->subsampling = subsampling;
pyramid->nLevels = nlevels;
pyramid->img = reinterpret_cast<_KLT_FloatImage *> (pyramid + 1);
pyramid->img = (_KLT_FloatImage *) (pyramid + 1);
pyramid->ncols = (int *) (pyramid->img + nlevels);
pyramid->nrows = (int *) (pyramid->ncols + nlevels);

2
rtengine/klt/trackFeatures.cc
View File

@@ -1462,7 +1462,7 @@ void KLTTrackFeatures(
_am_getSubFloatImage(pyramid1_gradx->img[0],xloc,yloc,featurelist->feature[indx]->aff_img_gradx);
_am_getSubFloatImage(pyramid1_grady->img[0],xloc,yloc,featurelist->feature[indx]->aff_img_grady);
featurelist->feature[indx]->aff_x = xloc - (int) xloc + (tc->affine_window_width+border)/2;
featurelist->feature[indx]->aff_y = yloc - (int) yloc + (tc->affine_window_height+border)/2;
featurelist->feature[indx]->aff_y = yloc - (int) yloc + (tc->affine_window_height+border)/2;;
}else{
/* affine tracking */
val = _am_trackFeatureAffine(featurelist->feature[indx]->aff_x, featurelist->feature[indx]->aff_y,