فهرست منبع

Fixed 32-bit and Win32 build issues.

Brucey 2 سال پیش
والد
کامیت
1e04e33e5b
3فایلهای تغییر یافته به همراه14 افزوده شده و 6 حذف شده
  1. 2 2
      jpeg2000.mod/glue.c
  2. 7 3
      jpeg2000.mod/include/opj_config_private.h
  3. 5 1
      jpeg2000.mod/jpeg2000.bmx

+ 2 - 2
jpeg2000.mod/glue.c

@@ -26,8 +26,8 @@
 #include "openjpeg.h"
 
 size_t image_jpeg2000_TJpeg2000Image__stream_read(void * p_buffer, size_t p_nb_bytes, void * p_user_data);
-int image_jpeg2000_TJpeg2000Image__stream_seek(OPJ_OFF_T p_nb_bytes, void * p_user_data);
-OPJ_OFF_T image_jpeg2000_TJpeg2000Image__stream_skip(OPJ_OFF_T p_nb_bytes, void * p_user_data);
+int image_jpeg2000_TJpeg2000Image__stream_seek(BBLONG p_nb_bytes, void * p_user_data);
+BBLONG image_jpeg2000_TJpeg2000Image__stream_skip(BBLONG p_nb_bytes, void * p_user_data);
 size_t image_jpeg2000_TJpeg2000Image__stream_size(void * p_user_data);
 BBObject * image_jpeg2000_TJpeg2000Image__NewPixmap(int width, int height);
 void * image_jpeg2000_TJpeg2000Image__PixmapPixels(BBObject * pixmap);

+ 7 - 3
jpeg2000.mod/include/opj_config_private.h

@@ -12,14 +12,18 @@
 #if !defined(__APPLE__)
 # define OPJ_HAVE_MALLOC_H 1
 #endif
-/* check if function `aligned_alloc` exists */
-#define OPJ_HAVE_ALIGNED_ALLOC 1
+
+#if defined(_WIN32)
 /* check if function `_aligned_malloc` exists */
-#define OPJ_HAVE__ALIGNED_MALLOC 0
+#define OPJ_HAVE__ALIGNED_MALLOC 1
+#endif
+
 /* check if function `memalign` exists */
+#if !defined(_WIN32)
 #define OPJ_HAVE_MEMALIGN 1
 /* check if function `posix_memalign` exists */
 #define OPJ_HAVE_POSIX_MEMALIGN 1
+#endif
 
 #if !defined(_POSIX_C_SOURCE)
 #if defined(OPJ_HAVE_FSEEKO) || defined(OPJ_HAVE_POSIX_MEMALIGN)

+ 5 - 1
jpeg2000.mod/jpeg2000.bmx

@@ -36,6 +36,10 @@ ModuleInfo "Copyright: Wrapper - 2023 Bruce A Henderson"
 
 ModuleInfo "History: 1.00 Initial Release"
 
+?win32
+ModuleInfo "CC_OPTS: -DOPJ_STATIC"
+?
+
 Import "common.bmx"
 
 
@@ -73,7 +77,7 @@ Type TJpeg2000Image
 		End If
 	End Function
 
-	Function _stream_skip:Size_T(count:Size_T, stream:TStream) { nomangle }
+	Function _stream_skip:Long(count:Long, stream:TStream) { nomangle }
 		Return stream.seek(count, SEEK_CUR_)
 	End Function