Browse Source

Another fix to iOS build.

EMGUCV_3_3_0
Canming Huang 8 years ago
parent
commit
0fde19c8a0
  1. 2
      Emgu.CV.Extern/core/core_cuda_c.cpp
  2. 12
      Emgu.CV.Extern/tesseract/libtesseract/leptonica/leptonica-1.74/src/gplot.c
  3. 9
      Emgu.CV.Extern/tesseract/libtesseract/leptonica/leptonica-1.74/src/writefile.c

2
Emgu.CV.Extern/core/core_cuda_c.cpp

@ -38,7 +38,7 @@ int cudaGetDevice()
cv::cuda::DeviceInfo* cudaDeviceInfoCreate(int* deviceId)
{
if (deviceId < 0)
if (*deviceId < 0)
*deviceId = cv::cuda::getDevice();
return new cv::cuda::DeviceInfo(*deviceId);

12
Emgu.CV.Extern/tesseract/libtesseract/leptonica/leptonica-1.74/src/gplot.c

@ -99,6 +99,9 @@
#include <string.h>
#include "allheaders.h"
#ifdef __APPLE__
#include "TargetConditions.h"
#endif
static const l_int32 L_BUF_SIZE = 512;
@ -377,14 +380,7 @@ gplotSetScaling(GPLOT *gplot,
l_int32
gplotMakeOutput(GPLOT *gplot)
{
#if __APPLE__
#include "TargetConditionals.h"
#if TARGET_IPHONE_SIMULATOR
return ERROR_INT("gplot not defined", procName, 1);
#elif TARGET_OS_IPHONE
return ERROR_INT("gplot not defined", procName, 1);
#endif
#elif WINAPI_FAMILY_APP
#if WINAPI_FAMILY_APP || TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
return ERROR_INT("gplot not defined", procName, 1);
#else
char buf[L_BUF_SIZE];

9
Emgu.CV.Extern/tesseract/libtesseract/leptonica/leptonica-1.74/src/writefile.c

@ -86,6 +86,11 @@
#include <process.h>
#endif
#ifdef __APPLE__
#include "TargetConditions.h"
#endif
/* Special flag for pixWrite(). The default for both unix and */
/* windows is to use whatever filename is given, as opposed to */
/* insuring the filename extension matches the image compression. */
@ -930,7 +935,9 @@ char fullpath[_MAX_PATH];
}
tempname = genPathname(buffer, NULL);
#ifndef _WIN32
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
return 1;
#elif ! defined( _WIN32 )
/* Unix */
if (var_DISPLAY_PROG == L_DISPLAY_WITH_XZGV) {

Loading…
Cancel
Save