remove unused code (Windows related)

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@860 d0cd1f9f-072b-0410-8dd7-cf729c803f20
lsfjGitHub · Jul 8, 2013 · 10c1169 · 10c1169
1 parent b5d3d66
commit 10c1169
Show file tree

Hide file tree

Showing 126 changed files with 9 additions and 434 deletions.
diff --git a/api/tesseractmain.cpp b/api/tesseractmain.cpp
@@ -17,12 +17,6 @@
 *
 **********************************************************************/
 
-// #define USE_VLD //Uncomment for Visual Leak Detector.
-#if (defined _MSC_VER && defined USE_VLD)
-#include "mfcpch.h"
-#include <vld.h>
-#endif
-
 // Include automatically generated configuration file if running autoconf
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
@@ -32,7 +26,6 @@
 #include "baseapi.h"
 #include "basedir.h"
 #include "strngs.h"
-#include "tesseractmain.h"
 #include "tprintf.h"
 
 /**********************************************************************
@@ -229,149 +222,3 @@ int main(int argc, char **argv) {
 
   return 0;                      // Normal exit
 }
-
-#ifdef _WIN32
-
-char szAppName[] = "Tesseract";   //app name
-int initialized = 0;
-
-/**********************************************************************
-* WinMain
-*
-* Main function for a windows program.
-**********************************************************************/
-
-int WINAPI WinMain(  //main for windows //command line
-        HINSTANCE hInstance,
-        HINSTANCE hPrevInstance,
-        LPSTR lpszCmdLine,
-        int nCmdShow) {
-  WNDCLASS wc;
-  HWND hwnd;
-  MSG msg;
-
-  char **argv;
-  char *argsin[2];
-  int argc;
-  int exit_code;
-
-  wc.style = CS_NOCLOSE | CS_OWNDC;
-  wc.lpfnWndProc = (WNDPROC) WndProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = hInstance;
-  wc.hIcon = NULL;         //LoadIcon (NULL, IDI_APPLICATION);
-  wc.hCursor = NULL;       //LoadCursor (NULL, IDC_ARROW);
-  wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = szAppName;
-
-  RegisterClass(&wc);
-
-  hwnd = CreateWindow (szAppName, szAppName,
-                       WS_OVERLAPPEDWINDOW | WS_DISABLED,
-                       CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                       CW_USEDEFAULT, HWND_DESKTOP, NULL, hInstance, NULL);
-
-  argsin[0] = strdup (szAppName);
-  argsin[1] = strdup (lpszCmdLine);
-  /*allocate memory for the args. There can never be more than half*/
-  /*the total number of characters in the arguments.*/
-  argv = (char **)malloc(((strlen(argsin[0]) + strlen(argsin[1])) / 2 + 1) *
-                         sizeof(char *));
-
-  /*now construct argv as it should be for C.*/
-  argc = parse_args (2, argsin, argv);
-
-  //  ShowWindow (hwnd, nCmdShow);
-  //  UpdateWindow (hwnd);
-
-  if (initialized) {
-    exit_code = main (argc, argv);
-    free (argsin[0]);
-    free (argsin[1]);
-    free(argv);
-    return exit_code;
-  }
-  while (GetMessage (&msg, NULL, 0, 0)) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-    if (initialized) {
-      exit_code = main (argc, argv);
-      break;
-    }
-    else
-      exit_code = msg.wParam;
-  }
-  free (argsin[0]);
-  free (argsin[1]);
-  free(argv);
-  return exit_code;
-}
-
-
-/**********************************************************************
-* WndProc
-*
-* Function to respond to messages.
-**********************************************************************/
-
-LONG WINAPI WndProc(            //message handler
-        HWND hwnd,              //window with message
-        UINT msg,               //message typ
-        WPARAM wParam,
-        LPARAM lParam) {
-  HDC hdc;
-
-  if (msg == WM_CREATE) {
-    //
-    // Create a rendering context.
-    //
-    hdc = GetDC (hwnd);
-    ReleaseDC(hwnd, hdc);
-    initialized = 1;
-    return 0;
-  }
-  return DefWindowProc (hwnd, msg, wParam, lParam);
-}
-
-
-/**********************************************************************
-* parse_args
-*
-* Turn a list of args into a new list of args with each separate
-* whitespace spaced string being an arg.
-**********************************************************************/
-
-int
-parse_args (                     /*refine arg list */
-        int argc,                /*no of input args */
-        char *argv[],            /*input args */
-        char *arglist[]          /*output args */
-        ) {
-  int argcount;            /*converted argc */
-  char *testchar;          /*char in option string */
-  int arg;                 /*current argument */
-
-  argcount = 0;            /*no of options */
-  for (arg = 0; arg < argc; arg++) {
-    testchar = argv[arg]; /*start of arg */
-    do {
-      while (*testchar
-             && (*testchar == ' ' || *testchar == '\n'
-                 || *testchar == '\t'))
-        testchar++; /*skip white space */
-      if (*testchar) {
-        /*new arg */
-        arglist[argcount++] = testchar;
-        /*skip to white space */
-        for (testchar++; *testchar && *testchar != ' ' && *testchar != '\n' && *testchar != '\t'; testchar++) ;
-        if (*testchar)
-          *testchar++ = '\0'; /*turn to separate args */
-      }
-    }
-    while (*testchar);
-  }
-  return argcount;         /*new number of args */
-}
-#endif
diff --git a/ccmain/adaptions.cpp b/ccmain/adaptions.cpp
@@ -23,8 +23,6 @@
 #pragma warning(disable:4305)  // int/float warnings
 #endif
 
-#include "mfcpch.h"
-
 #ifdef __UNIX__
 #include          <assert.h>
 #endif

diff --git a/ccmain/applybox.cpp b/ccmain/applybox.cpp
@@ -16,7 +16,6 @@
  ** limitations under the License.
  *
  **********************************************************************/
-#include "mfcpch.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4244)  // Conversion warnings

diff --git a/ccmain/control.cpp b/ccmain/control.cpp
@@ -18,8 +18,6 @@
  *
  **********************************************************************/
 
-#include "mfcpch.h"
-
 #include <string.h>
 #include <math.h>
 #ifdef __UNIX__
@@ -42,7 +40,6 @@
 #include "secname.h"
 #include "output.h"
 #include "callcpp.h"
-#include "notdll.h"
 #include "globals.h"
 #include "sorthelper.h"
 #include "tesseractclass.h"

diff --git a/ccmain/control.h b/ccmain/control.h
@@ -30,7 +30,6 @@
 #include          "ratngs.h"
 #include          "statistc.h"
 #include          "pageres.h"
-#include          "notdll.h"
 
 enum ACCEPTABLE_WERD_TYPE
 {

diff --git a/ccmain/docqual.cpp b/ccmain/docqual.cpp
@@ -21,7 +21,6 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "mfcpch.h"
 #include          <ctype.h>
 #include          "docqual.h"
 #include          "tfacep.h"

diff --git a/ccmain/docqual.h b/ccmain/docqual.h
@@ -21,7 +21,6 @@
 #define           DOCQUAL_H
 
 #include          "control.h"
-#include          "notdll.h"
 
 enum GARBAGE_LEVEL
 {

diff --git a/ccmain/fixspace.cpp b/ccmain/fixspace.cpp
@@ -19,7 +19,6 @@
 *
 **********************************************************************/
 
-#include "mfcpch.h"
 #include <ctype.h>
 #include "reject.h"
 #include "statistc.h"

diff --git a/ccmain/fixspace.h b/ccmain/fixspace.h
@@ -24,7 +24,6 @@
 
 #include          "pageres.h"
 #include          "params.h"
-#include          "notdll.h"
 
 void initialise_search(WERD_RES_LIST &src_list, WERD_RES_LIST &new_list);
 void transform_to_next_perm(WERD_RES_LIST &words);

diff --git a/ccmain/fixxht.cpp b/ccmain/fixxht.cpp
@@ -17,7 +17,6 @@
  *
  **********************************************************************/
 
-#include "mfcpch.h"
 #include          <string.h>
 #include          <ctype.h>
 #include          "params.h"

diff --git a/ccmain/imgscale.cpp b/ccmain/imgscale.cpp
@@ -31,7 +31,6 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "mfcpch.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "errcode.h"

diff --git a/ccmain/output.cpp b/ccmain/output.cpp
@@ -21,7 +21,6 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "mfcpch.h"
 #include <string.h>
 #include <ctype.h>
 #ifdef __UNIX__

diff --git a/ccmain/output.h b/ccmain/output.h
@@ -23,7 +23,6 @@
 #include          "params.h"
 //#include                                      "epapconv.h"
 #include          "pageres.h"
-#include          "notdll.h"
 
 /** test line ends */
 char determine_newline_type(WERD *word,        ///< word to do

diff --git a/ccmain/pagewalk.cpp b/ccmain/pagewalk.cpp
@@ -17,7 +17,6 @@
  *
  **********************************************************************/
 
-#include "mfcpch.h"
 #include "pageres.h"
 #include "tesseractclass.h"
 

diff --git a/ccmain/pgedit.h b/ccmain/pgedit.h
@@ -25,7 +25,6 @@
 #include          "werd.h"
 #include          "rect.h"
 #include          "params.h"
-#include          "notdll.h"
 #include          "tesseractclass.h"
 
 class ScrollView;

diff --git a/ccmain/reject.cpp b/ccmain/reject.cpp
@@ -22,8 +22,6 @@
 #pragma warning(disable:4305)  // int/float warnings
 #endif
 
-#include "mfcpch.h"
-
 #include          "tessvars.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -45,7 +43,6 @@
 /* #define SECURE_NAMES done in secnames.h when necessary */
 
 #include "tesseractclass.h"
-#include          "notdll.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H

diff --git a/ccmain/reject.h b/ccmain/reject.h
@@ -22,7 +22,6 @@
 
 #include          "params.h"
 #include          "pageres.h"
-#include          "notdll.h"
 
 void reject_blanks(WERD_RES *word);
 void reject_poor_matches(WERD_RES *word, BLOB_CHOICE_LIST_CLIST *blob_choices);

diff --git a/ccmain/scaleimg.cpp b/ccmain/scaleimg.cpp
@@ -28,14 +28,11 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "mfcpch.h"
 #include          <stdlib.h>
 #include          <string.h>
 #include          "fileerr.h"
 #include          "tprintf.h"
-//#include          "grphics.h"
 #include          "img.h"
-//#include                                      "basefile.h"
 #include          "imgscale.h"
 #include          "scaleimg.h"
 

diff --git a/ccmain/tessbox.cpp b/ccmain/tessbox.cpp
@@ -21,7 +21,6 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "mfcpch.h"
 #include          "tfacep.h"
 #include          "tfacepp.h"
 #include          "tessbox.h"

diff --git a/ccmain/tessbox.h b/ccmain/tessbox.h
@@ -21,7 +21,6 @@
 #define           TESSBOX_H
 
 #include          "ratngs.h"
-#include          "notdll.h"
 #include "tesseractclass.h"
 
 // TODO(ocr-team): Delete this along with other empty header files.

diff --git a/ccmain/tessedit.cpp b/ccmain/tessedit.cpp
@@ -17,7 +17,6 @@
  *
  **********************************************************************/
 
-#include "mfcpch.h"
 //#include                                                      <osfcn.h>
 //#include                                                      <signal.h>
 //#include                                                      <time.h>
@@ -51,8 +50,6 @@
 #include "tesseractclass.h"
 #include "params.h"
 
-#include          "notdll.h"     //phils nn stuff
-
 #define VARDIR        "configs/" /*variables files */
                                  //config under api
 #define API_CONFIG      "configs/api_config"

diff --git a/ccmain/tessedit.h b/ccmain/tessedit.h
@@ -22,7 +22,6 @@
 
 #include          "blobs.h"
 #include          "pgedit.h"
-#include          "notdll.h"
 
                                  //progress monitor
 extern ETEXT_DESC *global_monitor;

diff --git a/ccmain/tessvars.cpp b/ccmain/tessvars.cpp
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 
-#include "mfcpch.h"
 #include  "tessvars.h"
 
 FILE *debug_fp = stderr;  // write debug stuff here
diff --git a/ccmain/tessvars.h b/ccmain/tessvars.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 
 #include          "img.h"
-#include          "notdll.h"
 
 extern FILE *debug_fp;    // write debug stuff here
 #endif