codebase / stimlib

Commit 0df38ff3373c75c7964b39c462268c926ac51000

Authored by heziqi
1 parent 1d08c377

fixed head detached

Showing 4 changed files with 8 additions and 12 deletions   Show diff stats
Inline Side-by-side
envi/bil.h
  Show/Hide comments   View file @0df38ff
... ... @@ -825,7 +825,7 @@ public:
825 825 return true;
826 826 }
827 827  
828   -<<<<<<< HEAD
  828 +
829 829 //crop specified area the of the original file
830 830 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
831 831  
... ... @@ -852,8 +852,7 @@ public:
852 852 return true;
853 853 }
854 854  
855   -=======
856   ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
  855 +
857 856 //close the file
858 857 bool close(){
859 858 file.close();
... ...
envi/bip.h
  Show/Hide comments   View file @0df38ff
... ... @@ -908,7 +908,7 @@ public:
908 908 return true;
909 909 }
910 910  
911   -<<<<<<< HEAD
  911 +
912 912 //crop specified area the of the original file
913 913 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
914 914  
... ... @@ -933,8 +933,7 @@ public:
933 933 return true;
934 934 }
935 935  
936   -=======
937   ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
  936 +
938 937 //close the file
939 938 bool close(){
940 939 file.close();
... ...
envi/bsq.h
  Show/Hide comments   View file @0df38ff
... ... @@ -744,7 +744,7 @@ public:
744 744 free(bandj);
745 745 return true;
746 746 }
747   -<<<<<<< HEAD
  747 +
748 748  
749 749 //crop specified area the of the original file
750 750 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
... ... @@ -773,8 +773,7 @@ public:
773 773 free(temp);
774 774 return true;
775 775 }
776   -=======
777   ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
  776 +
778 777  
779 778 //close the file
780 779 bool close(){
... ...
envi/envi.h
  Show/Hide comments   View file @0df38ff
... ... @@ -711,7 +711,7 @@ public:
711 711 }
712 712 return false;
713 713 }
714   -<<<<<<< HEAD
  714 +
715 715  
716 716 //crop specified area the of the original file
717 717 bool crop(std::string outfile,unsigned x0, unsigned y0, unsigned x1, unsigned y1){
... ... @@ -748,8 +748,7 @@ public:
748 748 }
749 749 return false;
750 750 }
751   -=======
752   ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
  751 +
753 752 };
754 753  
755 754 } //end namespace rts
... ...