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
@@ -825,7 +825,7 @@ public: @@ -825,7 +825,7 @@ public:
825 return true; 825 return true;
826 } 826 }
827 827
828 -<<<<<<< HEAD 828 +
829 //crop specified area the of the original file 829 //crop specified area the of the original file
830 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){ 830 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
831 831
@@ -852,8 +852,7 @@ public: @@ -852,8 +852,7 @@ public:
852 return true; 852 return true;
853 } 853 }
854 854
855 -=======  
856 ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1 855 +
857 //close the file 856 //close the file
858 bool close(){ 857 bool close(){
859 file.close(); 858 file.close();
@@ -908,7 +908,7 @@ public: @@ -908,7 +908,7 @@ public:
908 return true; 908 return true;
909 } 909 }
910 910
911 -<<<<<<< HEAD 911 +
912 //crop specified area the of the original file 912 //crop specified area the of the original file
913 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){ 913 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
914 914
@@ -933,8 +933,7 @@ public: @@ -933,8 +933,7 @@ public:
933 return true; 933 return true;
934 } 934 }
935 935
936 -=======  
937 ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1 936 +
938 //close the file 937 //close the file
939 bool close(){ 938 bool close(){
940 file.close(); 939 file.close();
@@ -744,7 +744,7 @@ public: @@ -744,7 +744,7 @@ public:
744 free(bandj); 744 free(bandj);
745 return true; 745 return true;
746 } 746 }
747 -<<<<<<< HEAD 747 +
748 748
749 //crop specified area the of the original file 749 //crop specified area the of the original file
750 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){ 750 bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
@@ -773,8 +773,7 @@ public: @@ -773,8 +773,7 @@ public:
773 free(temp); 773 free(temp);
774 return true; 774 return true;
775 } 775 }
776 -=======  
777 ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1 776 +
778 777
779 //close the file 778 //close the file
780 bool close(){ 779 bool close(){
@@ -711,7 +711,7 @@ public: @@ -711,7 +711,7 @@ public:
711 } 711 }
712 return false; 712 return false;
713 } 713 }
714 -<<<<<<< HEAD 714 +
715 715
716 //crop specified area the of the original file 716 //crop specified area the of the original file
717 bool crop(std::string outfile,unsigned x0, unsigned y0, unsigned x1, unsigned y1){ 717 bool crop(std::string outfile,unsigned x0, unsigned y0, unsigned x1, unsigned y1){
@@ -748,8 +748,7 @@ public: @@ -748,8 +748,7 @@ public:
748 } 748 }
749 return false; 749 return false;
750 } 750 }
751 -=======  
752 ->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1 751 +
753 }; 752 };
754 753
755 } //end namespace rts 754 } //end namespace rts