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

[eos/base.git] / src / Objects / DataManip / mrcImage / doc / mrcImage.html

diff --git a/src/Objects/DataManip/mrcImage/doc/mrcImage.html b/src/Objects/DataManip/mrcImage/doc/mrcImage.html
index 1d48d76..1cb2a54 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/doc/mrcImage.html
+++ b/src/Objects/DataManip/mrcImage/doc/mrcImage.html
@@ -841,7 +841,8 @@ typedef struct mrcImage {
     char*           Image;
     unsigned char*  ImageCharImage;
     unsigned short* ImageShortImage;
-    unsigned long*  ImageLongImage;
+    signed   long*  ImageLongImage;
+    unsigned long*  ImageULongImage;
     float*          ImageFloatImage;
     double*         ImageDoubleImage;
 
@@ -869,6 +870,17 @@ typedef struct mrcImage {
     int flagSigned;
 } mrcImage;
 
+typedef struct mrcImagePyramidList {
+    mrcImage mrc;
+    mrcImage* up;
+    mrcImage* down;
+} mrcImagePyramidList;
+
+typedef struct mrcImagePyramid {
+    mrcImagePyramidList* top;
+    mrcImagePyramidList* current;
+} mrcImagePyramid;
+
 typedef struct mrcImageInformation {
     double mean;
     double rootMeanSquare;
@@ -1187,7 +1199,7 @@ extern void lmrcImageHistgram5(double** hist, unsigned long nlevel, double Low,
        /* Frequency */
 extern void lmrcImageHistgram3(double** hist, unsigned long nlevel, mrcImage* img);
 extern void lmrcImageHistgram4(double** hist, double delta, mrcImage* img);
-extern void lmrcImageHistgram6(double** hist, unsigned long nlevel, double Low, double High, mrcImage* img);
+extern void lmrcImageHistgram6(double** hist, double delta, double Low, double High, mrcImage* img);
 extern void lmrcImageInformation(mrcImageInformation* info, mrcImage* img);