diff --git a/api/baseapi.cpp b/api/baseapi.cpp index c8bee200..e677e6be 100644 --- a/api/baseapi.cpp +++ b/api/baseapi.cpp @@ -22,12 +22,8 @@ #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT -// Include leptonica library only if autoconf (or makefile etc) tell us to. #include "allheaders.h" -#else -#error "Sorry: Tesseract no longer compiles without leptonica!" -#endif + #ifdef USE_NLS #include #include diff --git a/api/tesseractmain.cpp b/api/tesseractmain.cpp index cf88df94..5a554720 100644 --- a/api/tesseractmain.cpp +++ b/api/tesseractmain.cpp @@ -34,9 +34,7 @@ #else #define _(x) (x) #endif -#ifndef HAVE_LIBLEPT -#error "Sorry: Tesseract no longer compiles or runs without Leptonica!"; -#endif + #include "allheaders.h" #include "baseapi.h" #include "strngs.h" diff --git a/ccmain/cube_control.cpp b/ccmain/cube_control.cpp index 61472fa3..305581a4 100644 --- a/ccmain/cube_control.cpp +++ b/ccmain/cube_control.cpp @@ -12,10 +12,7 @@ #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT -// Include leptonica library only if autoconf (or makefile etc) tell us to. #include "allheaders.h" -#endif #include "cube_object.h" #include "cube_reco_context.h" diff --git a/ccmain/pagesegmain.cpp b/ccmain/pagesegmain.cpp index 94e5f352..eae958ca 100644 --- a/ccmain/pagesegmain.cpp +++ b/ccmain/pagesegmain.cpp @@ -234,7 +234,6 @@ int Tesseract::AutoPageSeg(int resolution, bool single_column, // The blocks made by the ColumnFinder. Moved to blocks before return. BLOCK_LIST found_blocks; -#ifdef HAVE_LIBLEPT if (pix_binary_ != NULL) { if (textord_debug_images) { Pix* grey_pix = pixCreate(pixGetWidth(pix_binary_), @@ -267,7 +266,7 @@ int Tesseract::AutoPageSeg(int resolution, bool single_column, if (single_column) v_lines.clear(); } -#endif + TO_BLOCK_LIST port_blocks; // The rest of the algorithm uses the usual connected components. textord_.find_components(pix_binary_, blocks, &port_blocks); diff --git a/ccmain/tesseractclass.cpp b/ccmain/tesseractclass.cpp index 0c8efa93..62e0169e 100644 --- a/ccmain/tesseractclass.cpp +++ b/ccmain/tesseractclass.cpp @@ -28,10 +28,7 @@ #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT -// Include leptonica library only if autoconf (or makefile etc) tell us to. #include "allheaders.h" -#endif namespace tesseract { @@ -382,12 +379,10 @@ Tesseract::~Tesseract() { } void Tesseract::Clear() { -#ifdef HAVE_LIBLEPT if (pix_binary_ != NULL) pixDestroy(&pix_binary_); if (pix_grey_ != NULL) pixDestroy(&pix_grey_); -#endif deskew_ = FCOORD(1.0f, 0.0f); reskew_ = FCOORD(1.0f, 0.0f); orig_image_changed_ = false; diff --git a/configure.ac b/configure.ac index 76be4b35..9fc79218 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_CANONICAL_HOST # documentation. # TODO(luc) Generate good documentation using doxygen or equivalent PACKAGE_YEAR=2011 -PACKAGE_DATE="05/24" +PACKAGE_DATE="08/25" AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number]) @@ -272,9 +272,6 @@ AC_LANG_CPLUSPLUS # which causes unnecessary warnings with Visual C++. # Comment it out for now. #AC_CHECK_LIB(m,sqrt) -AC_CHECK_LIB(z,deflate) -AC_CHECK_LIB(png,png_read_png) -AC_CHECK_LIB(jpeg,jpeg_read_scanlines) AC_CHECK_LIB(pthread,sem_init) # ---------------------------------------- @@ -324,17 +321,6 @@ AC_CHECK_FUNCS(acos asin) # Test auxilliary packages # ---------------------------------------- -# Search JPEG library - not needed at the moment -# AC_PATH_JPEG(, -# [ no_jpeg=yes -# AC_MSG_WARN([JPEG support is disabled]) ]) - -dnl ------------------------------------------------------------ -dnl check for libtiff -dnl ------------------------------------------------------------ -AC_CHECK_LIB(tiff, TIFFReadScanline) -AC_CHECK_HEADER(tiffio.h,LIBTIFF='yes',AC_MSG_WARN([TIFF support is disabled])) - # Check location of leptonica/liblept headers. AC_MSG_CHECKING(for leptonica) AC_ARG_VAR(LIBLEPT_HEADERSDIR,[Leptonica headers directory]) diff --git a/image/imgs.cpp b/image/imgs.cpp index 6a8c2e78..488345e2 100644 --- a/image/imgs.cpp +++ b/image/imgs.cpp @@ -33,10 +33,7 @@ #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT -// Include leptonica library only if autoconf (or makefile etc) tell us to. #include "allheaders.h" -#endif #include "stderr.h" #include "tprintf.h" @@ -1495,8 +1492,6 @@ void IMAGE::check_legal_access( //check coords are legal BADIMAGESEEK.error ("IMAGE::check_legal_access", ABORT, "(%d,%d)", x, y); } -#ifdef HAVE_LIBLEPT -// ONLY available if you have Leptonica installed. /********************************************************************** * ToPix * @@ -1627,7 +1622,6 @@ void IMAGE::FromPix(const Pix* src_pix) { if (destroy_this_pix != NULL) pixDestroy(&destroy_this_pix); } -#endif // HAVE_LIBLEPT /************************************************************************* * convolver() diff --git a/image/svshowim.cpp b/image/svshowim.cpp index e9e6aa7b..2f3585ed 100644 --- a/image/svshowim.cpp +++ b/image/svshowim.cpp @@ -5,9 +5,9 @@ #ifdef HAVE_CONFIG_H #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT + #include "allheaders.h" -#endif + #include "svshowim.h" #include "scrollview.h" @@ -23,7 +23,7 @@ void sv_show_sub_image(IMAGE* source, // Image to show. ScrollView* window, // Window to draw in. inT32 xpos, // Place to show bottom-left. inT32 ypos) { // Y position. -#ifdef HAVE_LIBLEPT + Pix* pix; if (xstart != 0 || ystart != 0 || xext != source->get_xsize() || yext != source->get_ysize()) { @@ -36,5 +36,4 @@ void sv_show_sub_image(IMAGE* source, // Image to show. } window->Image(pix, xpos, window->TranslateYCoordinate(yext) + ypos); pixDestroy(&pix); -#endif } diff --git a/textord/bbgrid.cpp b/textord/bbgrid.cpp index 47c08096..1dfc1d88 100644 --- a/textord/bbgrid.cpp +++ b/textord/bbgrid.cpp @@ -153,8 +153,6 @@ IntGrid* IntGrid::NeighbourhoodSum() const { return sumgrid; } - -#ifdef HAVE_LIBLEPT // Make a Pix of the correct scaled size for the TraceOutline functions. Pix* GridReducedPix(const TBOX& box, int gridsize, ICOORD bleft, int* left, int* bottom) { @@ -232,7 +230,6 @@ Pix* TraceBlockOnReducedPix(BLOCK* block, int gridsize, } return pix; } -#endif } // namespace tesseract. diff --git a/textord/bbgrid.h b/textord/bbgrid.h index 75f5f2be..3cc26e5a 100644 --- a/textord/bbgrid.h +++ b/textord/bbgrid.h @@ -31,15 +31,13 @@ #ifdef HAVE_CONFIG_H #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT + #include "allheaders.h" -#endif class BLOCK; namespace tesseract { -#ifdef HAVE_LIBLEPT // Helper function to return a scaled Pix with one pixel per grid cell, // set (black) where the given outline enters the corresponding grid cell, // and clear where the outline does not touch the grid cell. @@ -51,7 +49,6 @@ Pix* TraceOutlineOnReducedPix(C_OUTLINE* outline, int gridsize, // As TraceOutlineOnReducedPix above, but on a BLOCK instead of a C_OUTLINE. Pix* TraceBlockOnReducedPix(BLOCK* block, int gridsize, ICOORD bleft, int* left, int* bottom); -#endif template class GridSearch; @@ -178,7 +175,7 @@ template class BBGrid // WARNING: InsertBBox may invalidate an active GridSearch. Call // RepositionIterator() on any GridSearches that are active on this grid. void InsertBBox(bool h_spread, bool v_spread, BBC* bbox); -#ifdef HAVE_LIBLEPT + // Using a pix from TraceOutlineOnReducedPix or TraceBlockOnReducedPix, in // which each pixel corresponds to a grid cell, insert a bbox into every // place in the grid where the corresponding pixel is 1. The Pix is handled @@ -189,7 +186,7 @@ template class BBGrid // WARNING: InsertPixPtBBox may invalidate an active GridSearch. Call // RepositionIterator() on any GridSearches that are active on this grid. void InsertPixPtBBox(int left, int bottom, Pix* pix, BBC* bbox); -#endif + // Remove the bbox from the grid. // WARNING: Any GridSearch operating on this grid could be invalidated! // If a GridSearch is operating, call GridSearch::RemoveBBox() instead. @@ -477,7 +474,6 @@ void BBGrid::InsertBBox(bool h_spread, bool v_spread, } } -#ifdef HAVE_LIBLEPT // Using a pix from TraceOutlineOnReducedPix or TraceBlockOnReducedPix, in // which each pixel corresponds to a grid cell, insert a bbox into every // place in the grid where the corresponding pixel is 1. The Pix is handled @@ -502,7 +498,6 @@ void BBGrid::InsertPixPtBBox(int left, int bottom, } } } -#endif // Remove the bbox from the grid. // WARNING: Any GridSearch operating on this grid could be invalidated! diff --git a/textord/colfind.cpp b/textord/colfind.cpp index 7c487796..a7bd0d6b 100644 --- a/textord/colfind.cpp +++ b/textord/colfind.cpp @@ -225,14 +225,14 @@ int ColumnFinder::FindBlocks(bool single_column, int imageheight, stroke_width_->FindLeaderPartitions(block, this); delete stroke_width_; stroke_width_ = NULL; -#ifdef HAVE_LIBLEPT + if (boxa != NULL) { // Convert the boxa/pixa to fake blobs aligned on the grid. ExtractImageBlobs(imageheight, boxa, pixa); boxaDestroy(&boxa); pixaDestroy(&pixa); } -#endif + // Decide which large blobs should be included in the grid as potential // characters. // A subsidiary grid used to decide which large blobs to use. diff --git a/textord/tablefind.cpp b/textord/tablefind.cpp index cf189b33..5d699113 100644 --- a/textord/tablefind.cpp +++ b/textord/tablefind.cpp @@ -26,9 +26,9 @@ #ifdef HAVE_CONFIG_H #include "config_auto.h" #endif -#ifdef HAVE_LIBLEPT + #include "allheaders.h" -#endif + #include "colpartitionset.h" #include "tablerecog.h" @@ -1993,7 +1993,6 @@ void TableFinder::DisplayColPartitionConnections( // Note: This method is only for debug purpose during development and // would not be part of checked in code void TableFinder::WriteToPix(const FCOORD& reskew) { -#ifdef HAVE_LIBLEPT // Input file must be named test1.tif PIX* pix = pixRead("test1.tif"); if (!pix) { @@ -2061,7 +2060,6 @@ void TableFinder::WriteToPix(const FCOORD& reskew) { boxaDestroy(&table_array); pixDestroy(&pix); pixDestroy(&out); -#endif } // Merge all colpartitions in table regions to make them a single diff --git a/textord/tordmain.cpp b/textord/tordmain.cpp index a2b7d5fa..1c68d768 100644 --- a/textord/tordmain.cpp +++ b/textord/tordmain.cpp @@ -39,11 +39,7 @@ #include "config_auto.h" #endif -// Some of the code in this file is dependent upon leptonica. If you don't -// have it, you don't get this functionality. -#ifdef HAVE_LIBLEPT #include "allheaders.h" -#endif const ERRCODE BLOCKLESS_BLOBS = "Warning:some blobs assigned to no block"; @@ -58,7 +54,6 @@ const ERRCODE BLOCKLESS_BLOBS = "Warning:some blobs assigned to no block"; * Set the horizontal and vertical stroke widths in the blob. **********************************************************************/ void SetBlobStrokeWidth(Pix* pix, BLOBNBOX* blob) { -#ifdef HAVE_LIBLEPT // Cut the blob rectangle into a Pix. int pix_height = pixGetHeight(pix); const TBOX& box = blob->bounding_box(); @@ -149,13 +144,6 @@ void SetBlobStrokeWidth(Pix* pix, BLOBNBOX* blob) { blob->set_vert_stroke_width(0.0f); } } -#else - // Without leptonica present, use the 2*area/perimeter as an approximation. - float width = 2.0f * blob->cblob()->area(); - width /= blob->cblob()->perimeter(); - blob->set_horz_stroke_width(width); - blob->set_vert_stroke_width(width); -#endif } diff --git a/viewer/scrollview.cpp b/viewer/scrollview.cpp index aa6c401a..27c2362b 100644 --- a/viewer/scrollview.cpp +++ b/viewer/scrollview.cpp @@ -48,12 +48,10 @@ const int kMaxMsgSize = 4096; const int kMaxIntPairSize = 45; // Holds %d,%d, for upto 64 bit. #include "scrollview.h" - #include "svutil.h" -#ifdef HAVE_LIBLEPT #include "allheaders.h" -#endif + struct SVPolyLineBuffer { bool empty; // Independent indicator to allow SendMsg to call SendPolygon. @@ -764,7 +762,6 @@ void ScrollView::ZoomToRectangle(int x1, int y1, int x2, int y2) { MIN(x1, x2), MIN(y1, y2), MAX(x1, x2), MAX(y1, y2)); } -#ifdef HAVE_LIBLEPT // Send an image of type PIX. void ScrollView::Image(PIX* image, int x_pos, int y_pos) { int width = image->w; @@ -839,7 +836,6 @@ void ScrollView::TransferBinaryImage(PIX* image) { } delete [] pixel_data; } -#endif // Escapes the ' character with a \, so it can be processed by LUA. // Note: The caller will have to make sure he deletes the newly allocated item. diff --git a/viewer/scrollview.h b/viewer/scrollview.h index b7ce99ec..ffdf0924 100644 --- a/viewer/scrollview.h +++ b/viewer/scrollview.h @@ -201,10 +201,8 @@ class ScrollView { * constructor, so this is not listed here) *******************************************************************************/ -#ifdef HAVE_LIBLEPT // Draw a Pix on (x,y). void Image(struct Pix* image, int x_pos, int y_pos); -#endif // Flush buffers and update display. static void Update(); @@ -347,14 +345,12 @@ class ScrollView { int TranslateYCoordinate(int y); private: -#ifdef HAVE_LIBLEPT // Transfers a binary Image. void TransferBinaryImage(struct Pix* image); // Transfers a gray scale Image. void TransferGrayImage(struct Pix* image); // Transfers a 32-Bit Image. void Transfer32bppImage(struct Pix* image); -#endif // Sets up ScrollView, depending on the variables from the constructor. void Initialize(const char* name, int x_pos, int y_pos, int x_size, diff --git a/vs2008/ccmain.vcproj b/vs2008/ccmain.vcproj index 30ceb3d9..a34d4718 100644 --- a/vs2008/ccmain.vcproj +++ b/vs2008/ccmain.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;..\vs2008\include;..\vs2008\include\leptonica;..\cube;..\neural_networks\runtime;..\vs2008\port" - PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -107,7 +107,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;..\vs2008\include;..\vs2008\include\leptonica;..\neural_networks\runtime;..\cube;..\vs2008\port" - PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;" + PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -171,7 +171,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;..\vs2008\include;..\vs2008\include\leptonica;..\cube;..\neural_networks\runtime;..\vs2008\port" - PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/cntraining.vcproj b/vs2008/cntraining.vcproj index 4253ff12..c4387b63 100644 --- a/vs2008/cntraining.vcproj +++ b/vs2008/cntraining.vcproj @@ -226,7 +226,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;..\vs2008\include" - PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/vs2008/cube.vcproj b/vs2008/cube.vcproj index 6e3207bf..8f674210 100644 --- a/vs2008/cube.vcproj +++ b/vs2008/cube.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\vs2008\include;..\vs2008\include\leptonica;..\ccutil;..\image;..\dict;..\ccmain;..\ccstruct;..\viewer;..\neural_networks\runtime;..\cutil;..\wordrec;..\langmodel;..\classify;..\textord;..\vs2008\port" - PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,HAVE_LIBLEPT,_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,,_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\ccutil;..\ccstruct;..\cutil;..\dict;..\ccmain;..\classify;..\textord;..\wordrec;..\neural_networks\runtime;..\image;..\viewer;..\vs2008\include\leptonica;..\vs2008\port" - PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,HAVE_LIBLEPT,_CRT_SECURE_NO_WARNINGS," + PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,,_CRT_SECURE_NO_WARNINGS," StringPooling="true" MinimalRebuild="false" ExceptionHandling="1" @@ -173,7 +173,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\ccutil;..\ccstruct;..\cutil;..\dict;..\ccmain;..\classify;..\textord;..\wordrec;..\neural_networks\runtime;..\image;..\viewer;..\vs2008\include\leptonica;..\vs2008\port" - PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,HAVE_LIBLEPT,_CRT_SECURE_NO_WARNINGS,LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32,USE_STD_NAMESPACE,__MSW32__,,_CRT_SECURE_NO_WARNINGS,LEPTONLIB_IMPORTS" StringPooling="true" MinimalRebuild="false" ExceptionHandling="1" diff --git a/vs2008/image.vcproj b/vs2008/image.vcproj index 0c2c690c..79bc9710 100644 --- a/vs2008/image.vcproj +++ b/vs2008/image.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\ccutil;..\viewer;..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -107,7 +107,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil,..\viewer,..\vs2008\include,..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -171,7 +171,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil,..\viewer,..\vs2008\include,..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/libtesseract_tessopt.vcproj b/vs2008/libtesseract_tessopt.vcproj index c9afc672..bc5bd8e8 100644 --- a/vs2008/libtesseract_tessopt.vcproj +++ b/vs2008/libtesseract_tessopt.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\ccutil;..\viewer" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -106,7 +106,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -170,7 +170,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/libtesseract_training.vcproj b/vs2008/libtesseract_training.vcproj index 450f1d6e..97d46c9a 100644 --- a/vs2008/libtesseract_training.vcproj +++ b/vs2008/libtesseract_training.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\ccutil;..\cutil;..\dict;..\viewer;..\ccstruct;..\image;..\classify;..\vs2008\include\leptonica;..\vs2008\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -106,7 +106,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -170,7 +170,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/mftraining.vcproj b/vs2008/mftraining.vcproj index 614d217e..50094379 100644 --- a/vs2008/mftraining.vcproj +++ b/vs2008/mftraining.vcproj @@ -225,7 +225,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict,../image" - PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/vs2008/tesseract.vcproj b/vs2008/tesseract.vcproj index 7d55a35d..30e3c8a7 100644 --- a/vs2008/tesseract.vcproj +++ b/vs2008/tesseract.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;..\vs2008\port" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\api,..\ccmain,..\ccutil,..\ccstruct,..\classify,..\cutil,..\dict,..\display,..\image,..\textord,..\viewer,..\wordrec,..\pageseg,.,include,include\leptonica;..\vs2008\port" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -246,7 +246,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;..\vs2008\port" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/vs2008/textord.vcproj b/vs2008/textord.vcproj index a8380e7d..8449f871 100644 --- a/vs2008/textord.vcproj +++ b/vs2008/textord.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\classify;..\wordrec;..\ccmain;..\dict;..\api;..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -107,7 +107,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image,..\ccstruct,..\classify,..\wordrec,..\ccmain,..\dict,..\api,..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -171,7 +171,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image,..\ccstruct,..\classify,..\wordrec,..\ccmain,..\dict,..\api,..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/viewer.vcproj b/vs2008/viewer.vcproj index 5430ff16..7a4d3a63 100644 --- a/vs2008/viewer.vcproj +++ b/vs2008/viewer.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -108,7 +108,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -173,7 +173,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\vs2008\include;..\vs2008\include\leptonica" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/vs2008/wordlist2dawg.vcproj b/vs2008/wordlist2dawg.vcproj index d8162bd9..82a40997 100644 --- a/vs2008/wordlist2dawg.vcproj +++ b/vs2008/wordlist2dawg.vcproj @@ -50,7 +50,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -233,7 +233,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/vs2010/ccmain.vcxproj b/vs2010/ccmain.vcxproj index d6c7a7e3..138f9e9c 100644 --- a/vs2010/ccmain.vcxproj +++ b/vs2010/ccmain.vcxproj @@ -54,7 +54,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -68,7 +68,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/ccstruct.vcxproj b/vs2010/ccstruct.vcxproj index 42d6518d..d9834465 100644 --- a/vs2010/ccstruct.vcxproj +++ b/vs2010/ccstruct.vcxproj @@ -131,7 +131,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -145,7 +145,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/ccutil.vcxproj b/vs2010/ccutil.vcxproj index cae9eda2..689d355f 100644 --- a/vs2010/ccutil.vcxproj +++ b/vs2010/ccutil.vcxproj @@ -121,7 +121,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -135,7 +135,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/classify.vcxproj b/vs2010/classify.vcxproj index ec577481..d855746c 100644 --- a/vs2010/classify.vcxproj +++ b/vs2010/classify.vcxproj @@ -119,7 +119,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -133,7 +133,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/cntraining.vcxproj b/vs2010/cntraining.vcxproj index d96d5315..41c121af 100644 --- a/vs2010/cntraining.vcxproj +++ b/vs2010/cntraining.vcxproj @@ -156,7 +156,7 @@ MaxSpeed OnlyExplicitInline ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;..\vs2008\include;%(AdditionalIncludeDirectories) - TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/vs2010/cube.vcxproj b/vs2010/cube.vcxproj index 245420f6..14da979f 100644 --- a/vs2010/cube.vcxproj +++ b/vs2010/cube.vcxproj @@ -128,7 +128,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -142,7 +142,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/cutil.vcxproj b/vs2010/cutil.vcxproj index e602c1f3..403a816d 100644 --- a/vs2010/cutil.vcxproj +++ b/vs2010/cutil.vcxproj @@ -86,7 +86,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -100,7 +100,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/dict.vcxproj b/vs2010/dict.vcxproj index 63038382..7f24fec7 100644 --- a/vs2010/dict.vcxproj +++ b/vs2010/dict.vcxproj @@ -73,7 +73,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -87,7 +87,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/image.vcxproj b/vs2010/image.vcxproj index 0bdd3a5a..85eaa8e5 100644 --- a/vs2010/image.vcxproj +++ b/vs2010/image.vcxproj @@ -68,7 +68,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -82,7 +82,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/libtesseract.vcxproj b/vs2010/libtesseract.vcxproj index 51df9172..82d04f48 100644 --- a/vs2010/libtesseract.vcxproj +++ b/vs2010/libtesseract.vcxproj @@ -158,7 +158,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -179,7 +179,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/libtesseract_tessopt.vcxproj b/vs2010/libtesseract_tessopt.vcxproj index ed3f270b..9f494803 100644 --- a/vs2010/libtesseract_tessopt.vcxproj +++ b/vs2010/libtesseract_tessopt.vcxproj @@ -60,7 +60,7 @@ Disabled ..\ccutil;..\viewer;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -91,7 +91,7 @@ MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/vs2010/libtesseract_training.vcxproj b/vs2010/libtesseract_training.vcxproj index 18ab052f..186fd91a 100644 --- a/vs2010/libtesseract_training.vcxproj +++ b/vs2010/libtesseract_training.vcxproj @@ -60,7 +60,7 @@ Disabled ..\ccutil;..\cutil;..\dict;..\viewer;..\ccstruct;..\image;..\classify;..\vs2008\include\leptonica;..\vs2008\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -91,7 +91,7 @@ MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/vs2010/mftraining.vcxproj b/vs2010/mftraining.vcxproj index afe8803f..a49c912b 100644 --- a/vs2010/mftraining.vcxproj +++ b/vs2010/mftraining.vcxproj @@ -155,7 +155,7 @@ MaxSpeed OnlyExplicitInline ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/vs2010/neural_networks.vcxproj b/vs2010/neural_networks.vcxproj index 9a1c3032..57698caf 100644 --- a/vs2010/neural_networks.vcxproj +++ b/vs2010/neural_networks.vcxproj @@ -64,7 +64,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -78,7 +78,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/tesseract.vcxproj b/vs2010/tesseract.vcxproj index 162e1e06..067bb938 100644 --- a/vs2010/tesseract.vcxproj +++ b/vs2010/tesseract.vcxproj @@ -70,7 +70,7 @@ MaxSpeed OnlyExplicitInline ..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;port;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -122,7 +122,7 @@ Disabled ..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;port;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/vs2010/textord.vcxproj b/vs2010/textord.vcxproj index fb500ae7..543ca93b 100644 --- a/vs2010/textord.vcxproj +++ b/vs2010/textord.vcxproj @@ -128,7 +128,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -142,7 +142,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/viewer.vcxproj b/vs2010/viewer.vcxproj index 17834e18..21817be8 100644 --- a/vs2010/viewer.vcxproj +++ b/vs2010/viewer.vcxproj @@ -64,7 +64,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -78,7 +78,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h diff --git a/vs2010/wordlist2dawg.vcxproj b/vs2010/wordlist2dawg.vcxproj index ac77afd7..dfe87069 100644 --- a/vs2010/wordlist2dawg.vcxproj +++ b/vs2010/wordlist2dawg.vcxproj @@ -79,7 +79,7 @@ MaxSpeed OnlyExplicitInline ../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;%(PreprocessorDefinitions) + NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -170,7 +170,7 @@ MaxSpeed OnlyExplicitInline ../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;%(PreprocessorDefinitions) + NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/vs2010/wordrec.vcxproj b/vs2010/wordrec.vcxproj index a165f81e..5e59bd0f 100644 --- a/vs2010/wordrec.vcxproj +++ b/vs2010/wordrec.vcxproj @@ -101,7 +101,7 @@ Level3 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;_DEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h @@ -115,7 +115,7 @@ Level3 - _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;HAVE_LIBLEPT;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) NotUsing ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h