diff options
| author | Kinan Hakim <kinan@google.com> | 2016-01-04 17:15:19 +0100 |
|---|---|---|
| committer | Kinan Hakim <kinan@google.com> | 2016-01-04 16:25:46 +0000 |
| commit | 2dd7464aac6607e6b74065579d546dd0de0a86b7 (patch) | |
| tree | fc5cb48c4dde701e415ea7b4eb6325a4deb53b2f | |
| parent | 54fe7f27da016b3302250b644d839b0d82d33920 (diff) | |
| download | dng_sdk-2dd7464aac6607e6b74065579d546dd0de0a86b7.tar.gz | |
Use MobileCoreServices on iOS.
| -rw-r--r-- | source/dng_date_time.cpp | 7 | ||||
| -rw-r--r-- | source/dng_string.cpp | 42 | ||||
| -rw-r--r-- | source/dng_utils.cpp | 7 |
3 files changed, 51 insertions, 5 deletions
diff --git a/source/dng_date_time.cpp b/source/dng_date_time.cpp index a12c008..53a911a 100644 --- a/source/dng_date_time.cpp +++ b/source/dng_date_time.cpp @@ -24,8 +24,13 @@ #include <time.h> #if qMacOS +#include <TargetConditionals.h> +#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#include <MobileCoreServices/MobileCoreServices.h> +#else #include <CoreServices/CoreServices.h> -#endif +#endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#endif // qMacOS #if qWinOS #include <windows.h> diff --git a/source/dng_string.cpp b/source/dng_string.cpp index 935f04b..e378088 100644 --- a/source/dng_string.cpp +++ b/source/dng_string.cpp @@ -23,8 +23,13 @@ #include "dng_safe_arithmetic.h" #if qMacOS +#include <TargetConditionals.h> +#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#include <MobileCoreServices/MobileCoreServices.h> +#else #include <CoreServices/CoreServices.h> -#endif +#endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#endif // qMacOS #if qWinOS #include <windows.h> @@ -87,6 +92,29 @@ static void ThrowNotHardened() } #if qMacOS +#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR + +static uint32 Extract_SystemEncoding (const dng_string &dngString, + dng_memory_data &buffer) + { + ThrowProgramError ("Extract_SystemEncoding() not implemented on iOS"); + return 0; + } + +static void Assign_SystemEncoding (dng_string &dngString, + const char *otherString) + { + ThrowProgramError ("Assign_SystemEncoding() not implemented on iOS"); + + } + +static void Assign_JIS_X208_1990 (dng_string &dngString, + const char *otherString) + { + ThrowProgramError ("Assign_JIS_X208_1990() not implemented on iOS"); + } + +#else static void Assign_Multibyte (dng_string &dngString, const char *otherString, @@ -294,7 +322,8 @@ static void Assign_JIS_X208_1990 (dng_string &dngString, } -#endif +#endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#endif // qMacOS /*****************************************************************************/ @@ -2146,7 +2175,13 @@ int32 dng_string::Compare (const dng_string &s) const { #if qMacOS + #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR + ThrowProgramError ("Compare() not implemented on iOS"); + return 0; + + #else + { dng_memory_data aStrA; @@ -2230,7 +2265,8 @@ int32 dng_string::Compare (const dng_string &s) const } } - + + #endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR #elif qWinOS { diff --git a/source/dng_utils.cpp b/source/dng_utils.cpp index 68ac0fc..e27b030 100644 --- a/source/dng_utils.cpp +++ b/source/dng_utils.cpp @@ -29,8 +29,13 @@ #include "dng_tile_iterator.h" #if qMacOS +#include <TargetConditionals.h> +#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#include <MobileCoreServices/MobileCoreServices.h> +#else #include <CoreServices/CoreServices.h> -#endif +#endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR +#endif // qMacOS #if qiPhone || qMacOS // these provide timers |