missing returns in nonvoid functions (thanks to rusnakp) issue 389;

corrected windows installation script - tesseract should be not run as start-up application;

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@514 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
zdenop@gmail.com 2010-10-26 13:35:02 +00:00
parent 21d6ea66c2
commit 346da8c1e5
2 changed files with 10 additions and 2 deletions

View File

@ -337,6 +337,8 @@ Pix* TessBaseAPI::GetThresholdedImage() {
if (tesseract_->pix_binary() == NULL)
Threshold(tesseract_->mutable_pix_binary());
return pixClone(tesseract_->pix_binary());
#else
return NULL;
#endif
}
@ -410,6 +412,8 @@ Boxa* TessBaseAPI::GetRegions(Pixa** pixa) {
boxaAddBox(boxa, lbox, L_INSERT);
}
return boxa;
#else
return NULL;
#endif
}
@ -484,6 +488,8 @@ Boxa* TessBaseAPI::GetTextlines(Pixa** pixa, int** blockids) {
}
}
return boxa;
#else
return NULL;
#endif
}
@ -529,6 +535,8 @@ Boxa* TessBaseAPI::GetWords(Pixa** pixa) {
}
}
return boxa;
#else
return NULL;
#endif // HAVE_LIBLEPT
}

View File

@ -194,7 +194,7 @@ Section "Tesseract-OCR" SecDummy
;Store installation folder
WriteRegStr HKCU "Software\Tesseract-OCR" "InstallDir" $INSTDIR
WriteRegStr HKCU "Software\Tesseract-OCR" "CurrentVersion" "${VERSION}"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tesseract-OCR" "$INSTDIR\tesseract.exe"
;WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tesseract-OCR" "$INSTDIR\tesseract.exe"
; include for some of the windows messages defines
!include "winmessages.nsh"
@ -419,7 +419,7 @@ Section "Uninstall"
!define MUI_FINISHPAGE_SHOWREADME
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create desktop shortcut"
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDeskShortcut
DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Tesseract-OCR"
;DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Tesseract-OCR"
DeleteRegKey /ifempty HKCU "Software\Tesseract-OCR"
; delete variable
${un.EnvVarUpdate} $0 "PATH" "R" "HKCU" $INSTDIR