WinRT/WinCE/WP8 cleanup

opencv · Oct 15, 2024 · 2d3a500 · 2d3a500
1 parent d131137
commit 2d3a500
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 64 deletions.
diff --git a/modules/cannops/CMakeLists.txt b/modules/cannops/CMakeLists.txt
@@ -1,4 +1,4 @@
- if(IOS OR WINRT OR ANDROID OR APPLE OR WIN32 OR (NOT HAVE_CANN))
+ if(IOS OR ANDROID OR APPLE OR WIN32 OR (NOT HAVE_CANN))
  ocv_module_disable(cannops)
  endif()
 

diff --git a/modules/cudaarithm/CMakeLists.txt b/modules/cudaarithm/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudaarithm)
 endif()
 

diff --git a/modules/cudacodec/CMakeLists.txt b/modules/cudacodec/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR APPLE OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR APPLE OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudacodec)
 endif()
 
@@ -54,4 +54,4 @@ endif()
 ocv_create_module(${extra_libs})
 
 ocv_add_accuracy_tests()
-ocv_add_perf_tests()
+ocv_add_perf_tests()
diff --git a/modules/cudafeatures2d/CMakeLists.txt b/modules/cudafeatures2d/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudafeatures2d)
 endif()
 

diff --git a/modules/cudafilters/CMakeLists.txt b/modules/cudafilters/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudafilters)
 endif()
 

diff --git a/modules/cudaimgproc/CMakeLists.txt b/modules/cudaimgproc/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudaimgproc)
 endif()
 

diff --git a/modules/cudaoptflow/CMakeLists.txt b/modules/cudaoptflow/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudaoptflow)
 endif()
 
@@ -27,4 +27,4 @@ if(NOT CUDA_VERSION VERSION_LESS "10.0")
  add_definitions(-DHAVE_NVIDIA_OPTFLOW=2)
  ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}")
  endif()
-endif()
+endif()
diff --git a/modules/cudastereo/CMakeLists.txt b/modules/cudastereo/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR  WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudastereo)
 endif()
 

diff --git a/modules/cudawarping/CMakeLists.txt b/modules/cudawarping/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
+if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
  ocv_module_disable(cudawarping)
 endif()
 

diff --git a/modules/datasets/src/tinyxml2/tinyxml2.cpp b/modules/datasets/src/tinyxml2/tinyxml2.cpp
@@ -1666,7 +1666,7 @@ XMLUnknown* XMLDocument::NewUnknown( const char* str )
 
 static FILE* callfopen( const char* filepath, const char* mode )
 {
-#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
  FILE* fp = 0;
  errno_t err = fopen_s( &fp, filepath, mode );
  if ( err ) {
@@ -1862,17 +1862,7 @@ void XMLPrinter::Print( const char* format, ... )
  }
  else {
 #if defined(_MSC_VER) && (_MSC_VER >= 1400 )
- #if defined(WINCE)
- int len = 512;
- do {
- len = len*2;
- char* str = new char[len]();
- len = _vsnprintf(str, len, format, va);
- delete[] str;
- }while (len < 0);
- #else
  int len = _vscprintf( format, va );
- #endif
 #else
  int len = vsnprintf( 0, 0, format, va );
 #endif
@@ -1881,11 +1871,7 @@ void XMLPrinter::Print( const char* format, ... )
  va_start( va, format );
  char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator.
 #if defined(_MSC_VER) && (_MSC_VER >= 1400 )
- #if defined(WINCE)
- _vsnprintf( p, len+1, format, va );
- #else
  vsnprintf_s( p, len+1, _TRUNCATE, format, va );
- #endif
 #else
  vsnprintf( p, len+1, format, va );
 #endif

diff --git a/modules/datasets/src/tinyxml2/tinyxml2.h b/modules/datasets/src/tinyxml2/tinyxml2.h
@@ -91,7 +91,7 @@ distribution.
 #endif
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
 // Microsoft visual studio, version 2005 and higher.
 /*int _snprintf_s(
  char *buffer,
@@ -109,9 +109,6 @@ inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... )
  return result;
 }
 #define TIXML_SSCANF sscanf_s
-#elif defined WINCE
-#define TIXML_SNPRINTF _snprintf
-#define TIXML_SSCANF sscanf
 #else
 // GCC version 3 and higher
 //#warning( "Using sn* functions." )
@@ -506,13 +503,13 @@ class XMLUtil
  static bool IsWhiteSpace( char p ) {
  return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) );
  }
- 
+
  inline static bool IsNameStartChar( unsigned char ch ) {
  return ( ( ch < 128 ) ? isalpha( ch ) : 1 )
  || ch == ':'
  || ch == '_';
  }
- 
+
  inline static bool IsNameChar( unsigned char ch ) {
  return IsNameStartChar( ch )
  || isdigit( ch )
@@ -535,7 +532,7 @@ class XMLUtil
  }
  return false;
  }
- 
+
  inline static int IsUTF8Continuation( const char p ) {
  return p & 0x80;
  }
@@ -1266,14 +1263,14 @@ class TINYXML2_LIB XMLElement : public XMLNode
  return a->QueryFloatValue( value );
  }
 
- 
+
  /** Given an attribute name, QueryAttribute() returns
  XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion
  can't be performed, or XML_NO_ATTRIBUTE if the attribute
  doesn't exist. It is overloaded for the primitive types,
  and is a generally more convenient replacement of
  QueryIntAttribute() and related functions.
- 
+
  If successful, the result of the conversion
  will be written to 'value'. If not successful, nothing will
  be written to 'value'. This allows you to provide default
@@ -1401,7 +1398,7 @@ class TINYXML2_LIB XMLElement : public XMLNode
  @verbatim
  <foo>Hullaballoo!<b>This is text</b></foo>
  @endverbatim
- 
+
  For this XML:
  @verbatim
  <foo />
@@ -1415,13 +1412,13 @@ class TINYXML2_LIB XMLElement : public XMLNode
  /// Convenience method for setting text inside and element. See SetText() for important limitations.
  void SetText( int value );
  /// Convenience method for setting text inside and element. See SetText() for important limitations.
- void SetText( unsigned value ); 
+ void SetText( unsigned value );
  /// Convenience method for setting text inside and element. See SetText() for important limitations.
- void SetText( bool value ); 
+ void SetText( bool value );
  /// Convenience method for setting text inside and element. See SetText() for important limitations.
- void SetText( double value ); 
+ void SetText( double value );
  /// Convenience method for setting text inside and element. See SetText() for important limitations.
- void SetText( float value ); 
+ void SetText( float value );
 
  /**
  Convenience method to query the value of a child text node. This is probably best
@@ -1673,7 +1670,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
  }
  /// If there is an error, print it to stdout.
  void PrintError() const;
- 
+
  /// Clear the document, resetting it to the initial state.
  void Clear();
 

diff --git a/modules/julia/cmake/init.cmake b/modules/julia/cmake/init.cmake
@@ -1,4 +1,4 @@
-OCV_OPTION(WITH_JULIA "Include Julia support (opencv_contrib)" OFF IF (NOT ANDROID AND NOT IOS AND NOT WINRT AND NOT WIN32))
+OCV_OPTION(WITH_JULIA "Include Julia support (opencv_contrib)" OFF IF (NOT ANDROID AND NOT IOS AND NOT WIN32))
 
 ocv_assert(OPENCV_INITIAL_PASS)
 

diff --git a/modules/matlab/cmake/init.cmake b/modules/matlab/cmake/init.cmake
@@ -1,4 +1,4 @@
-OCV_OPTION(WITH_MATLAB "Include Matlab support (opencv_contrib)" OFF IF (NOT ANDROID AND NOT IOS AND NOT WINRT))
+OCV_OPTION(WITH_MATLAB "Include Matlab support (opencv_contrib)" OFF IF (NOT ANDROID AND NOT IOS))
 
 ocv_assert(OPENCV_INITIAL_PASS)
 

diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(IOS OR WINRT)
+if(IOS)
  ocv_module_disable(superres)
 endif()
 

diff --git a/modules/tracking/perf/perf_main.cpp b/modules/tracking/perf/perf_main.cpp
@@ -7,11 +7,7 @@ static
 void initTrackingTests()
 {
  const char* extraTestDataPath =
-#ifdef WINRT
- NULL;
-#else
  getenv("OPENCV_DNN_TEST_DATA_PATH");
-#endif
  if (extraTestDataPath)
  cvtest::addDataSearchPath(extraTestDataPath);
 

diff --git a/modules/tracking/test/test_main.cpp b/modules/tracking/test/test_main.cpp
@@ -7,11 +7,7 @@ static
 void initTrackingTests()
 {
  const char* extraTestDataPath =
-#ifdef WINRT
- NULL;
-#else
  getenv("OPENCV_DNN_TEST_DATA_PATH");
-#endif
  if (extraTestDataPath)
  cvtest::addDataSearchPath(extraTestDataPath);
 

diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt
@@ -4,9 +4,5 @@ if(HAVE_CUDA)
  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
 endif()
 
-if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
-endif()
-
 ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_3d
 OPTIONAL opencv_cudawarping opencv_cudaoptflow opencv_videoio WRAP python)
diff --git a/modules/wechat_qrcode/perf/perf_main.cpp b/modules/wechat_qrcode/perf/perf_main.cpp
@@ -8,11 +8,7 @@ void initQRTests()
 {
 #ifdef HAVE_OPENCV_DNN
  const char* extraTestDataPath =
-#ifdef WINRT
- NULL;
-#else
  getenv("OPENCV_DNN_TEST_DATA_PATH");
-#endif
  if (extraTestDataPath)
  cvtest::addDataSearchPath(extraTestDataPath);
 #endif // HAVE_OPENCV_DNN

diff --git a/modules/wechat_qrcode/test/test_main.cpp b/modules/wechat_qrcode/test/test_main.cpp
@@ -16,11 +16,7 @@ void initTests()
 {
 #ifdef HAVE_OPENCV_DNN
  const char* extraTestDataPath =
-#ifdef WINRT
- NULL;
-#else
  getenv("OPENCV_DNN_TEST_DATA_PATH");
-#endif
  if (extraTestDataPath)
  cvtest::addDataSearchPath(extraTestDataPath);
 #endif // HAVE_OPENCV_DNN