mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 19:01:58 +08:00
75bd2efe0d
* [many ports] 2019.09.14 Updates * Revert failure ports * Revert failure ports * Revert failure ports * [urdfdom] Fix find dependency console_bridge * Revert failure ports * [devil] Compatible with jasper 2.0.20 * [devil] Refix compatible with jasper functions declaration on different os * Update ports/alembic/CONTROL Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Revert failure ports wangle * [azure-kinect-sensor-sdk] Fix build with matroska 1.6.2 * Revert failure ports * Revert failure ports * [urdfdom-headers] Fix include path in config.cmake file * upload patch * [urdfdom-headers] Refix include path in config.cmake file * [qt5-imageformats] Fix missing include math.h * [urdfdom-headers] Refix include path in config.cmake file * [qt5] Fix adding option PATCHES and other options when using qt_submodule_installation * Remove updated ports version * Commit suggestions * [libideviceactivation] revert Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
diff --git a/DevIL/src-IL/src/il_jp2.cpp b/DevIL/src-IL/src/il_jp2.cpp
|
|
index 730afee..a419c14 100644
|
|
--- a/DevIL/src-IL/src/il_jp2.cpp
|
|
+++ b/DevIL/src-IL/src/il_jp2.cpp
|
|
@@ -313,20 +313,31 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILimage *Image)
|
|
}
|
|
|
|
|
|
-
|
|
-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
|
|
+#ifdef __APPLE__
|
|
+static int iJp2_file_read(void *obj, char *buf, unsigned int cnt)
|
|
+#else
|
|
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
|
|
+#endif
|
|
{
|
|
obj;
|
|
- return iread(buf, 1, cnt);
|
|
+ return iread((void*)buf, 1, cnt);
|
|
}
|
|
|
|
-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
|
|
+#ifdef __APPLE__
|
|
+static int iJp2_file_write(void *obj, const char *buf, unsigned int cnt)
|
|
+#else
|
|
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
|
|
+#endif
|
|
{
|
|
obj;
|
|
return iwrite(buf, 1, cnt);
|
|
}
|
|
|
|
+#ifdef __APPLE__
|
|
static long iJp2_file_seek(jas_stream_obj_t *obj, long offset, int origin)
|
|
+#else
|
|
+static long iJp2_file_seek(void *obj, long offset, int origin)
|
|
+#endif
|
|
{
|
|
obj;
|
|
|
|
@@ -343,7 +354,11 @@ static long iJp2_file_seek(jas_stream_obj_t *obj, long offset, int origin)
|
|
return 0; // Failed
|
|
}
|
|
|
|
+#ifdef __APPLE__
|
|
+static int iJp2_file_close(void *obj)
|
|
+#else
|
|
static int iJp2_file_close(jas_stream_obj_t *obj)
|
|
+#endif
|
|
{
|
|
obj;
|
|
return 0; // We choose when we want to close the file.
|