Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

Conflicts:
	src/Objects/DataManip/mrcImage/doc/mrcImage.html

diff --cc src/Objects/DataManip/mrcImage/doc/mrcImage.html
index 56a8fd3,6eed6dd..85b2a22
--- 1/src/Objects/DataManip/mrcImage/doc/mrcImage.html
--- 2/src/Objects/DataManip/mrcImage/doc/mrcImage.html
+++ b/src/Objects/DataManip/mrcImage/doc/mrcImage.html
@@@ -103,343 -103,6 +103,346 @@@
  <H2>Information from source codes</H2>
  </A>
  <PRE>
++<<<<<<< HEAD
 +../src/fftn.c:
 +
 +../src/lmrcFETnormalizeBySD.c:
 +
 +../src/lmrcFFTExpression.c:
 +
 +../src/lmrcFFTFGconj.c:
 +
 +../src/lmrcFFTFxG.c:
 +
 +../src/lmrcFFTInfo.c:
 +
 +../src/lmrcImage3DPad.c:
 +
 +../src/lmrcImage3DWindowing.c:
 +
 +../src/lmrcImageAddValue.c:
 +
 +../src/lmrcImageAsProbability.c:
 +
 +../src/lmrcImageAverage.c:
 +
 +../src/lmrcImageBandPassFilter.c:
 +
 +../src/lmrcImageBilateralFilter.c:
 +
 +../src/lmrcImageBinarization.c:
 +
 +../src/lmrcImageBottomHatTransform.c:
 +
 +../src/lmrcImageBoundaryInfo.c:
 +
 +../src/lmrcImageCTFCompensation.c:
 +
 +../src/lmrcImageCTFDetermination.c:
 +
 +../src/lmrcImageCTFObservation.c:
 +
 +../src/lmrcImageCTFSN.c:
 +
 +../src/lmrcImageCVE.c:
 +
 +../src/lmrcImageCalcArea.c:
 +
 +../src/lmrcImageCenterGet.c:
 +
 +../src/lmrcImageCentre.c:
 +
 +../src/lmrcImageClosing.c:
 +
 +../src/lmrcImageClusterAnalysis.c:
 +
 +../src/lmrcImageCommonLine.c:
 +
 +../src/lmrcImageConnection.c:
 +
 +../src/lmrcImageConnectivityNumberCalc.c:
 +
 +../src/lmrcImageContourSurface.c:
 +
 +../src/lmrcImageContraction.c:
 +
 +../src/lmrcImageCorrelation.c:
 +     $lmrcImageEuclidDistanceCalc:  Calculate Euclid distance between two images $
 +     $arg: in1:  input mrcImage1 $
 +     $arg: in2:  input mrcImage2 $
 +     $arg: mode: input int $
 +     $mode: 0 Sum of SQR $
 +     $mode: 1 Distance $
 +     $return: EuclidDistance $
 +
 +../src/lmrcImageCorrelationPVM.c:
 +
 +../src/lmrcImageCorrelationWithCTFCompensation.c:
 +
 +../src/lmrcImageCorrelationinSpace.c:
 +
 +../src/lmrcImageCrystalCreate.c:
 +
 +../src/lmrcImageDataMaxAndMinGetByImage.c:
 +
 +../src/lmrcImageDataStraightCopy.c:
 +
 +../src/lmrcImageDeconvolution.c:
 +
 +../src/lmrcImageDensity.c:
 +
 +../src/lmrcImageDensityInverse.c:
 +
 +../src/lmrcImageDensityNormalizationByImage.c:
 +
 +../src/lmrcImageDifferential.c:
 +
 +../src/lmrcImageDilation.c:
 +
 +../src/lmrcImageDistanceConversion.c:
 +
 +../src/lmrcImageEdge.c:
 +
 +../src/lmrcImageEdgeAverage.c:
 +
 +../src/lmrcImageEdgeEnhancement.c:
 +
 +../src/lmrcImageErosion.c:
 +
 +../src/lmrcImageFFT.c:
 +
 +../src/lmrcImageFOMCalc.c:
 +
 +../src/lmrcImageFeatureExtraction.c:
 +
 +../src/lmrcImageFeatureExtractionCoOccurrence.c:
 +
 +../src/lmrcImageFeatureExtractionRunLength.c:
 +
 +../src/lmrcImageFilterCreate.c:
 +
 +../src/lmrcImageFirstNoiseReductionByRelaxation.c:
 +
 +../src/lmrcImageFloating.c:
 +
 +../src/lmrcImageFourierNeighborCorrelation.c:
 +
 +../src/lmrcImageFourierPowerSpectrum.c:
 +
 +../src/lmrcImageFourierShellCorrelation.c:
 +
 +../src/lmrcImageHighPassFilter.c:
 +
 +../src/lmrcImageHighlighting.c:
 +
 +../src/lmrcImageHoughTransform.c:
 +
 +../src/lmrcImageLabeling.c:
 +
 +../src/lmrcImageLogicalOperation.c:
 +
 +../src/lmrcImageLowPassFilter.c:
 +
 +../src/lmrcImageMasking.c:
 +
 +../src/lmrcImageMaxDataGet.c:
 +
 +../src/lmrcImageMirroring.c:
 +     $lmrcImageMirroring: (mrcImage* out, mrcImage* in, lmrcImageMirroring mode) $
 +
 +../src/lmrcImageModeChange.c:
 +
 +../src/lmrcImageModelCreate.c:
 +
 +../src/lmrcImageMontageCreate.c:
 +
 +../src/lmrcImageMorphology.c:
 +
 +../src/lmrcImageMove.c:
 +
 +../src/lmrcImageMultiCTFCompensation.c:
 +
 +../src/lmrcImageMultiplying.c:
 +
 +../src/lmrcImageNegativeLaplacian.c:
 +
 +../src/lmrcImageNoiseCreate.c:
 +
 +../src/lmrcImageNormalizing.c:
 +
 +../src/lmrcImageOneLineSimilarityCalc.c:
 +
 +../src/lmrcImageOpening.c:
 +
 +../src/lmrcImagePad.c:
 +
 +../src/lmrcImagePartImageSegmentation.c:
 +
 +../src/lmrcImagePixelSummationOfProbabilityGetByImage.c:
 +
 +../src/lmrcImagePosterization.c:
 +
 +../src/lmrcImagePrewitt.c:
 +
 +../src/lmrcImageProjection.c:
 +
 +../src/lmrcImageProportionalDensityLevelSetByImage.c:
 +
 +../src/lmrcImageROI2D.c:
 +
 +../src/lmrcImageROI3D.c:
 +
 +../src/lmrcImageROInotChangeHeaderLength.c:
 +
 +../src/lmrcImageRadialDistribution.c:
 +
 +../src/lmrcImageRhoFiltering.c:
 +
 +../src/lmrcImageRoberts.c:
 +
 +../src/lmrcImageRotation.c:
 +
 +../src/lmrcImageSSDA.c:
 +
 +../src/lmrcImageSamplingUnitChange.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxation.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxationDijValueSet.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxationQValueSet.c:
 +
 +../src/lmrcImageSecondNoiseReductionByRelaxationRValueSet.c:
 +
 +../src/lmrcImageShapePCA.c:
 +
 +../src/lmrcImageShift.c:
 +
 +../src/lmrcImageShrink.c:
 +
 +../src/lmrcImageSigmaCalculate.c:
 +
 +../src/lmrcImageSinogram.c:
 +
 +../src/lmrcImageSinogramCorrelation.c:
 +
 +../src/lmrcImageSinogramFFT.c:
 +
 +../src/lmrcImageSmoothing.c:
 +
 +../src/lmrcImageSobel.c:
 +
 +../src/lmrcImageSolventFlattening.c:
 +
 +../src/lmrcImageSpatialFrequencyFilter.c:
 +
 +../src/lmrcImageSphere.c:
 +
 +../src/lmrcImageSplit.c:
 +
 +../src/lmrcImageStack.c:
 +
 +../src/lmrcImageStudentCalculate.c:
 +
 +../src/lmrcImageSubtractionCalc.c:
 +
 +../src/lmrcImageSummationCalculate.c:
 +
 +../src/lmrcImageSymmetryFind.c:
 +
 +../src/lmrcImageTfunction.c:
 +
 +../src/lmrcImageToneReversal.c:
 +
 +../src/lmrcImageTopHatTransform.c:
 +
 +../src/lmrcImageTrans.c:
 +
 +../src/lmrcImageTransformDescartesIntoPolar.c:
 +
 +../src/lmrcImageTriming.c:
 +
 +../src/lmrcImageVolumeCalc.c:
 +
 +../src/lmrcImageWindowing.c:
 +
 +../src/lmrcImagesFTest.c:
 +
 +../src/lmrcImagesStatDataGet.c:
 +
 +../src/lmrcImagesTTest.c:
 +
 +../src/lmrcImagesVarianceAnalysis.c:
 +
 +../src/lmrcImagesVarianceMap.c:
 +
 +../src/lmrcSinogramFET.c:
 +
 +../src/lmrcSinogramFETPCA.c:
 +
 +../src/lmrcSinogramFETcalcWeight.c:
 +
 +../src/lmrcSinogramFETcorrelationMap.c:
 +
 +../src/lmrcSinogramFETnormalizedMap.c:
 +
 +../src/lmrcSinogramFETreferredCorrelation.c:
 +
 +../src/lmrcSinogramFETsmoothParameterMatching.c:
 +
 +../src/mrcImageCheckFFT.c:
 +
 +../src/mrcImageCheckSameSize.c:
 +
 +../src/mrcImageCopy.c:
 +
 +../src/mrcImageDataSet.c:
 +
 +../src/mrcImageError.c:
 +
 +../src/mrcImageGet.c:
 +
 +../src/mrcImageGetPixels.c:
 +
 +../src/mrcImageInfo.c:
 +
 +../src/mrcImageInit.c:
 +
 +../src/mrcImageOperation.c:
 +
 +../src/mrcImagePVM.c:
 +
 +../src/mrcImagePrint.c:
 +
 +../src/mrcImageRead.c:
 +
 +../src/mrcImageSectionGet.c:
 +
 +../src/mrcImageSectionSet.c:
 +
 +../src/mrcImageSet.c:
 +
 +../src/mrcImageTailer.c:
 +
 +../src/mrcImageToIntImage.c:
 +
 +../src/mrcImageUtil.c:
 +
 +../src/mrcImageUtilityforVariance.c:
 +
 +../src/mrcImageWrite.c:
 +
 +../src/mrcImageWrite2.c:
 +
 +../src/mrcImagefuncmin.c:
 +
 +../src/mrcRefUtil.c:
++=======
++>>>>>>> FETCH_HEAD
  </PRE>
  <HR>
  <A NAME="include">