From dabf3c299f24595436e5915e034d9d6f0755185f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 25 Apr 2018 19:33:24 +0200 Subject: [PATCH] Fix file endings Text files should end with a LF, but not additional empty lines. Signed-off-by: Stefan Weil --- INSTALL | 1 - android/AndroidManifest.xml | 2 +- java/com/google/scrollview/ui/SVAbstractMenuItem.java | 1 - java/com/google/scrollview/ui/SVCheckboxMenuItem.java | 1 - java/com/google/scrollview/ui/SVEmptyMenuItem.java | 2 -- java/com/google/scrollview/ui/SVMenuItem.java | 1 - java/com/google/scrollview/ui/SVSubMenuItem.java | 2 -- src/arch/Makefile.am | 1 - src/ccmain/Makefile.am | 1 - src/ccmain/par_control.cpp | 2 -- src/ccmain/pgedit.cpp | 3 --- src/ccmain/thresholder.cpp | 1 - src/ccstruct/blamer.cpp | 1 - src/ccstruct/boxread.cpp | 1 - src/ccstruct/detlinefit.h | 2 -- src/ccstruct/dppoint.cpp | 1 - src/ccstruct/fontinfo.cpp | 1 - src/ccutil/bitvector.cpp | 2 -- src/ccutil/indexmapbidi.cpp | 1 - src/ccutil/serialis.cpp | 1 - src/classify/Makefile.am | 2 -- src/classify/errorcounter.cpp | 5 ----- src/classify/sampleiterator.cpp | 1 - src/classify/shapeclassifier.cpp | 5 ----- src/classify/tessclassifier.cpp | 2 -- src/dict/Makefile.am | 2 -- src/lstm/input.h | 1 - src/lstm/maxpool.cpp | 1 - src/lstm/maxpool.h | 1 - src/lstm/networkbuilder.cpp | 1 - src/lstm/plumbing.cpp | 1 - src/lstm/plumbing.h | 1 - src/textord/alignedblob.cpp | 1 - src/textord/drawtord.cpp | 1 - src/textord/imagefind.cpp | 1 - src/textord/linefind.cpp | 1 - src/training/classifier_tester.cpp | 6 ------ src/training/lstmtraining.cpp | 2 -- src/training/tesstrain.sh | 2 -- src/training/unicharset_training_utils.cpp | 1 - src/vs2010/tesseract/libtesseract.rc.in | 1 - src/vs2010/tesseract/tesseract.rc.in | 1 - src/wordrec/lm_pain_points.cpp | 1 - src/wordrec/params_model.h | 1 - tessdata/configs/get.image | 2 +- tessdata/tessconfigs/batch | 1 - testing/FILES | 1 - testing/README | 1 - testing/counttestset.sh | 2 -- 49 files changed, 2 insertions(+), 75 deletions(-) mode change 100755 => 100644 testing/counttestset.sh diff --git a/INSTALL b/INSTALL index 22aa2e0a..f1bf217a 100644 --- a/INSTALL +++ b/INSTALL @@ -227,4 +227,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index d5bf0998..0a53a932 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,4 +1,4 @@ \ No newline at end of file +--> diff --git a/java/com/google/scrollview/ui/SVAbstractMenuItem.java b/java/com/google/scrollview/ui/SVAbstractMenuItem.java index a007bcf5..a5c9c92d 100644 --- a/java/com/google/scrollview/ui/SVAbstractMenuItem.java +++ b/java/com/google/scrollview/ui/SVAbstractMenuItem.java @@ -55,4 +55,3 @@ abstract class SVAbstractMenuItem { */ public void performAction(SVWindow window, SVEventType eventType) {} } - diff --git a/java/com/google/scrollview/ui/SVCheckboxMenuItem.java b/java/com/google/scrollview/ui/SVCheckboxMenuItem.java index fa7fc6c0..7559702d 100644 --- a/java/com/google/scrollview/ui/SVCheckboxMenuItem.java +++ b/java/com/google/scrollview/ui/SVCheckboxMenuItem.java @@ -57,4 +57,3 @@ class SVCheckboxMenuItem extends SVAbstractMenuItem { return Boolean.toString(bvalue); } } - diff --git a/java/com/google/scrollview/ui/SVEmptyMenuItem.java b/java/com/google/scrollview/ui/SVEmptyMenuItem.java index 6880c068..950bcb5b 100644 --- a/java/com/google/scrollview/ui/SVEmptyMenuItem.java +++ b/java/com/google/scrollview/ui/SVEmptyMenuItem.java @@ -44,5 +44,3 @@ class SVEmptyMenuItem extends SVAbstractMenuItem { ScrollView.addMessage(svme); } } - - diff --git a/java/com/google/scrollview/ui/SVMenuItem.java b/java/com/google/scrollview/ui/SVMenuItem.java index 8b8f39cb..932ab7cc 100644 --- a/java/com/google/scrollview/ui/SVMenuItem.java +++ b/java/com/google/scrollview/ui/SVMenuItem.java @@ -58,4 +58,3 @@ class SVMenuItem extends SVAbstractMenuItem { return value; } } - diff --git a/java/com/google/scrollview/ui/SVSubMenuItem.java b/java/com/google/scrollview/ui/SVSubMenuItem.java index 0f4c5f5e..ebcf36cb 100644 --- a/java/com/google/scrollview/ui/SVSubMenuItem.java +++ b/java/com/google/scrollview/ui/SVSubMenuItem.java @@ -37,5 +37,3 @@ class SVSubMenuItem extends SVAbstractMenuItem { mi.add(jli); } } - - diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am index 668d11c7..a254bb52 100644 --- a/src/arch/Makefile.am +++ b/src/arch/Makefile.am @@ -32,4 +32,3 @@ libtesseract_avx_la_SOURCES = dotproductavx.cpp libtesseract_avx2_la_SOURCES = intsimdmatrixavx2.cpp libtesseract_sse_la_SOURCES = dotproductsse.cpp intsimdmatrixsse.cpp - diff --git a/src/ccmain/Makefile.am b/src/ccmain/Makefile.am index 63e9ee11..e7a71b3e 100644 --- a/src/ccmain/Makefile.am +++ b/src/ccmain/Makefile.am @@ -34,4 +34,3 @@ libtesseract_main_la_SOURCES = \ tessbox.cpp tessedit.cpp tesseractclass.cpp tessvars.cpp \ tfacepp.cpp thresholder.cpp \ werdit.cpp - diff --git a/src/ccmain/par_control.cpp b/src/ccmain/par_control.cpp index a81dc6a7..06ab70cf 100644 --- a/src/ccmain/par_control.cpp +++ b/src/ccmain/par_control.cpp @@ -70,5 +70,3 @@ void Tesseract::PrerecAllWordsPar(const GenericVector& words) { } } // namespace tesseract. - - diff --git a/src/ccmain/pgedit.cpp b/src/ccmain/pgedit.cpp index 81845483..6f1ac7af 100644 --- a/src/ccmain/pgedit.cpp +++ b/src/ccmain/pgedit.cpp @@ -998,6 +998,3 @@ void Tesseract::blob_feature_display(PAGE_RES* page_res, #endif // GRAPHICS_DISABLED } // namespace tesseract - - - diff --git a/src/ccmain/thresholder.cpp b/src/ccmain/thresholder.cpp index 9a28d41d..5a193c32 100644 --- a/src/ccmain/thresholder.cpp +++ b/src/ccmain/thresholder.cpp @@ -330,4 +330,3 @@ void ImageThresholder::ThresholdRectToPix(Pix* src_pix, } } // namespace tesseract. - diff --git a/src/ccstruct/blamer.cpp b/src/ccstruct/blamer.cpp index 48c2fdec..a84e87f2 100644 --- a/src/ccstruct/blamer.cpp +++ b/src/ccstruct/blamer.cpp @@ -584,4 +584,3 @@ void BlamerBundle::SetMisAdaptionDebug(const WERD_CHOICE *best_choice, } } } - diff --git a/src/ccstruct/boxread.cpp b/src/ccstruct/boxread.cpp index 0eafe05a..277b8ddb 100644 --- a/src/ccstruct/boxread.cpp +++ b/src/ccstruct/boxread.cpp @@ -237,4 +237,3 @@ void MakeBoxFileStr(const char* unichar_str, const TBOX& box, int page_num, box_str->add_str_int(" ", box.top()); box_str->add_str_int(" ", page_num); } - diff --git a/src/ccstruct/detlinefit.h b/src/ccstruct/detlinefit.h index 12afbb79..4dc645c6 100644 --- a/src/ccstruct/detlinefit.h +++ b/src/ccstruct/detlinefit.h @@ -160,5 +160,3 @@ class DetLineFit { } // namespace tesseract. #endif // TESSERACT_CCSTRUCT_DETLINEFIT_H_ - - diff --git a/src/ccstruct/dppoint.cpp b/src/ccstruct/dppoint.cpp index 37ee4636..fe952bd9 100644 --- a/src/ccstruct/dppoint.cpp +++ b/src/ccstruct/dppoint.cpp @@ -95,4 +95,3 @@ void DPPoint::UpdateIfBetter(int64_t cost, int32_t steps, const DPPoint* prev, } } // namespace tesseract. - diff --git a/src/ccstruct/fontinfo.cpp b/src/ccstruct/fontinfo.cpp index 8fa4ceec..30f3748a 100644 --- a/src/ccstruct/fontinfo.cpp +++ b/src/ccstruct/fontinfo.cpp @@ -244,4 +244,3 @@ bool write_set(FILE* f, const FontSet& fs) { } } // namespace tesseract. - diff --git a/src/ccutil/bitvector.cpp b/src/ccutil/bitvector.cpp index 68bb3271..729aa5f3 100644 --- a/src/ccutil/bitvector.cpp +++ b/src/ccutil/bitvector.cpp @@ -265,5 +265,3 @@ void BitVector::Alloc(int length) { } // namespace tesseract. - - diff --git a/src/ccutil/indexmapbidi.cpp b/src/ccutil/indexmapbidi.cpp index 61477d0f..fe9e083e 100644 --- a/src/ccutil/indexmapbidi.cpp +++ b/src/ccutil/indexmapbidi.cpp @@ -247,4 +247,3 @@ int IndexMapBiDi::MapFeatures(const GenericVector& sparse, } } // namespace tesseract. - diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp index 898d0d51..f351f5c1 100644 --- a/src/ccutil/serialis.cpp +++ b/src/ccutil/serialis.cpp @@ -163,4 +163,3 @@ int TFile::FWrite(const void* buffer, int size, int count) { } // namespace tesseract. - diff --git a/src/classify/Makefile.am b/src/classify/Makefile.am index 3eaa2aa6..9e48d418 100644 --- a/src/classify/Makefile.am +++ b/src/classify/Makefile.am @@ -35,5 +35,3 @@ libtesseract_classify_la_SOURCES = \ ocrfeatures.cpp outfeat.cpp picofeat.cpp protos.cpp \ sampleiterator.cpp shapeclassifier.cpp shapetable.cpp \ tessclassifier.cpp trainingsample.cpp trainingsampleset.cpp - - diff --git a/src/classify/errorcounter.cpp b/src/classify/errorcounter.cpp index df1eceea..f8bb514b 100644 --- a/src/classify/errorcounter.cpp +++ b/src/classify/errorcounter.cpp @@ -500,8 +500,3 @@ void ErrorCounter::Counts::operator+=(const Counts& other) { } // namespace tesseract. - - - - - diff --git a/src/classify/sampleiterator.cpp b/src/classify/sampleiterator.cpp index 1353964c..9d52c4fb 100644 --- a/src/classify/sampleiterator.cpp +++ b/src/classify/sampleiterator.cpp @@ -259,4 +259,3 @@ const UnicharAndFonts* SampleIterator::GetShapeEntry() const { } } // namespace tesseract. - diff --git a/src/classify/shapeclassifier.cpp b/src/classify/shapeclassifier.cpp index 4167831e..7c10d6fe 100644 --- a/src/classify/shapeclassifier.cpp +++ b/src/classify/shapeclassifier.cpp @@ -229,8 +229,3 @@ void ShapeClassifier::FilterDuplicateUnichars( } } // namespace tesseract. - - - - - diff --git a/src/classify/tessclassifier.cpp b/src/classify/tessclassifier.cpp index 8bd86c81..de56e528 100644 --- a/src/classify/tessclassifier.cpp +++ b/src/classify/tessclassifier.cpp @@ -83,5 +83,3 @@ int TessClassifier::DisplayClassifyAs( } } // namespace tesseract - - diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am index 49359c42..d8670fd8 100644 --- a/src/dict/Makefile.am +++ b/src/dict/Makefile.am @@ -16,5 +16,3 @@ libtesseract_dict_la_SOURCES = \ context.cpp \ dawg.cpp dawg_cache.cpp dict.cpp hyphen.cpp \ permdawg.cpp stopper.cpp trie.cpp - - diff --git a/src/lstm/input.h b/src/lstm/input.h index 5bdefcb6..17ebbfb2 100644 --- a/src/lstm/input.h +++ b/src/lstm/input.h @@ -102,4 +102,3 @@ class Input : public Network { } // namespace tesseract. #endif // TESSERACT_LSTM_INPUT_H_ - diff --git a/src/lstm/maxpool.cpp b/src/lstm/maxpool.cpp index a4e24ce8..cf303739 100644 --- a/src/lstm/maxpool.cpp +++ b/src/lstm/maxpool.cpp @@ -83,4 +83,3 @@ bool Maxpool::Backward(bool debug, const NetworkIO& fwd_deltas, } // namespace tesseract. - diff --git a/src/lstm/maxpool.h b/src/lstm/maxpool.h index 99e765ac..24dc4ed2 100644 --- a/src/lstm/maxpool.h +++ b/src/lstm/maxpool.h @@ -67,4 +67,3 @@ class Maxpool : public Reconfig { #endif // TESSERACT_LSTM_MAXPOOL_H_ - diff --git a/src/lstm/networkbuilder.cpp b/src/lstm/networkbuilder.cpp index 275ce23d..c946cda2 100644 --- a/src/lstm/networkbuilder.cpp +++ b/src/lstm/networkbuilder.cpp @@ -485,4 +485,3 @@ Network* NetworkBuilder::ParseOutput(const StaticShape& input_shape, } } // namespace tesseract. - diff --git a/src/lstm/plumbing.cpp b/src/lstm/plumbing.cpp index a83d1426..bdd48520 100644 --- a/src/lstm/plumbing.cpp +++ b/src/lstm/plumbing.cpp @@ -244,4 +244,3 @@ void Plumbing::CountAlternators(const Network& other, double* same, } } // namespace tesseract. - diff --git a/src/lstm/plumbing.h b/src/lstm/plumbing.h index a2aa1f20..030a1060 100644 --- a/src/lstm/plumbing.h +++ b/src/lstm/plumbing.h @@ -142,4 +142,3 @@ class Plumbing : public Network { } // namespace tesseract. #endif // TESSERACT_LSTM_PLUMBING_H_ - diff --git a/src/textord/alignedblob.cpp b/src/textord/alignedblob.cpp index 16d78743..bf99d9bd 100644 --- a/src/textord/alignedblob.cpp +++ b/src/textord/alignedblob.cpp @@ -529,4 +529,3 @@ BLOBNBOX* AlignedBlob::FindAlignedBlob(const AlignedBlobParams& p, } } // namespace tesseract. - diff --git a/src/textord/drawtord.cpp b/src/textord/drawtord.cpp index 83071cf6..c0d13821 100644 --- a/src/textord/drawtord.cpp +++ b/src/textord/drawtord.cpp @@ -418,4 +418,3 @@ void plot_row_cells( //draw words } #endif // GRAPHICS_DISABLED - diff --git a/src/textord/imagefind.cpp b/src/textord/imagefind.cpp index 0ea7f606..ebf55d65 100644 --- a/src/textord/imagefind.cpp +++ b/src/textord/imagefind.cpp @@ -1366,4 +1366,3 @@ void ImageFind::FindImagePartitions(Pix* image_pix, const FCOORD& rotation, } // namespace tesseract. - diff --git a/src/textord/linefind.cpp b/src/textord/linefind.cpp index 360a3fc4..27c33fd4 100644 --- a/src/textord/linefind.cpp +++ b/src/textord/linefind.cpp @@ -771,4 +771,3 @@ void LineFinder::GetLineBoxes(bool horizontal_lines, } } // namespace tesseract. - diff --git a/src/training/classifier_tester.cpp b/src/training/classifier_tester.cpp index a904583c..346218ca 100644 --- a/src/training/classifier_tester.cpp +++ b/src/training/classifier_tester.cpp @@ -139,9 +139,3 @@ int main(int argc, char **argv) { return 0; } /* main */ - - - - - - diff --git a/src/training/lstmtraining.cpp b/src/training/lstmtraining.cpp index 096e3e42..ac7017c4 100644 --- a/src/training/lstmtraining.cpp +++ b/src/training/lstmtraining.cpp @@ -210,5 +210,3 @@ int main(int argc, char **argv) { tprintf("Finished! Error rate = %g\n", trainer.best_error_rate()); return 0; } /* main */ - - diff --git a/src/training/tesstrain.sh b/src/training/tesstrain.sh index 03cec1b8..57f2c907 100644 --- a/src/training/tesstrain.sh +++ b/src/training/tesstrain.sh @@ -77,5 +77,3 @@ else make__traineddata tlog "\nCompleted training for language '${LANG_CODE}'\n" fi - - diff --git a/src/training/unicharset_training_utils.cpp b/src/training/unicharset_training_utils.cpp index 05094d19..97459dba 100644 --- a/src/training/unicharset_training_utils.cpp +++ b/src/training/unicharset_training_utils.cpp @@ -207,4 +207,3 @@ void SetPropertiesForInputFile(const std::string& script_dir, } } // namespace tesseract - diff --git a/src/vs2010/tesseract/libtesseract.rc.in b/src/vs2010/tesseract/libtesseract.rc.in index 0ce9e9e1..98414acc 100644 --- a/src/vs2010/tesseract/libtesseract.rc.in +++ b/src/vs2010/tesseract/libtesseract.rc.in @@ -98,4 +98,3 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - diff --git a/src/vs2010/tesseract/tesseract.rc.in b/src/vs2010/tesseract/tesseract.rc.in index b431ac97..b4d309a2 100644 --- a/src/vs2010/tesseract/tesseract.rc.in +++ b/src/vs2010/tesseract/tesseract.rc.in @@ -98,4 +98,3 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - diff --git a/src/wordrec/lm_pain_points.cpp b/src/wordrec/lm_pain_points.cpp index e482cf99..c6a3428b 100644 --- a/src/wordrec/lm_pain_points.cpp +++ b/src/wordrec/lm_pain_points.cpp @@ -215,4 +215,3 @@ void LMPainPoints::RemapForSplit(int index) { } } // namespace tesseract - diff --git a/src/wordrec/params_model.h b/src/wordrec/params_model.h index df48d5bd..6414d2b8 100644 --- a/src/wordrec/params_model.h +++ b/src/wordrec/params_model.h @@ -86,4 +86,3 @@ class ParamsModel { } // namespace tesseract #endif // TESSERACT_WORDREC_PARAMS_MODEL_H_ - diff --git a/tessdata/configs/get.image b/tessdata/configs/get.image index 7c761be9..7d00b613 100644 --- a/tessdata/configs/get.image +++ b/tessdata/configs/get.image @@ -1 +1 @@ -tessedit_write_images T \ No newline at end of file +tessedit_write_images T diff --git a/tessdata/tessconfigs/batch b/tessdata/tessconfigs/batch index 619b6467..a681e4a4 100644 --- a/tessdata/tessconfigs/batch +++ b/tessdata/tessconfigs/batch @@ -1,2 +1 @@ # No content needed as all defaults are correct. - diff --git a/testing/FILES b/testing/FILES index 049691eb..db1605a7 100644 --- a/testing/FILES +++ b/testing/FILES @@ -16,4 +16,3 @@ DuTillet1004Pg2LG.jpg - Sample from Hebrew Matthew Project with parallel texts hebrew-nikud-genesis-1-2.png - Genesis 1-2 Hebrew example from OCR forum forum post - https://community.logos.com/forums/p/16124/277997.aspx direct link to image - https://community.logos.com/cfs-filesystemfile.ashx/__key/CommunityServer.Discussions.Components.Files/77/4578.Gen.png - diff --git a/testing/README b/testing/README index 48024a90..67fb50ca 100644 --- a/testing/README +++ b/testing/README @@ -40,4 +40,3 @@ and go to the gym, have lunch etc. Step 8: There should be a file testing/reports/tess2.0.summary that contains the final summarized accuracy report and comparison with the 1995 results. - diff --git a/testing/counttestset.sh b/testing/counttestset.sh old mode 100755 new mode 100644 index 4bce68da..8e2fd63a --- a/testing/counttestset.sh +++ b/testing/counttestset.sh @@ -57,5 +57,3 @@ do done <"$pages" testing/unlv/accsum "$accfiles" >"testing/reports/$setname.characc" testing/unlv/wordaccsum "$wafiles" >"testing/reports/$setname.wordacc" - -