< prev index next >

src/java.desktop/share/native/libmlib_image/mlib_image_proto.h

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -28,10 +28,11 @@
 #define __ORIG_MLIB_IMAGE_PROTO_H
 
 #include <mlib_types.h>
 #include <mlib_status.h>
 #include <mlib_image_types.h>
+#include "jni.h"
 #if defined ( __MEDIALIB_OLD_NAMES_ADDED )
 #include <../include/mlib_image_proto.h>
 #endif /* defined ( __MEDIALIB_OLD_NAMES_ADDED ) */
 
 #ifdef __cplusplus

@@ -41,16 +42,10 @@
 #if defined ( __USE_J2D_NAMES )
 #include "j2d_names.h"
 #endif // __USE_J2D_NAMES
 
 #if defined ( _MSC_VER )
-#define J2D_MLIB_PUBLIC __declspec(dllexport)
-#else
-#define J2D_MLIB_PUBLIC
-#endif /* _MSC_VER */
-
-#if defined ( _MSC_VER )
 #if ! defined ( __MEDIALIB_OLD_NAMES )
 #define __MEDIALIB_OLD_NAMES
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
 #endif /* defined ( _MSC_VER ) */
 

@@ -1057,22 +1052,22 @@
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreate mlib_ImageCreate
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_image * __mlib_ImageCreate(mlib_type type,
+JNIEXPORT mlib_image * JNICALL
+__mlib_ImageCreate(mlib_type type,
                                 mlib_s32 channels,
                                 mlib_s32 width,
                                 mlib_s32 height);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreateStruct mlib_ImageCreateStruct
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_image * __mlib_ImageCreateStruct(mlib_type type,
+JNIEXPORT mlib_image * JNICALL
+__mlib_ImageCreateStruct(mlib_type type,
                                       mlib_s32 channels,
                                       mlib_s32 width,
                                       mlib_s32 height,
                                       mlib_s32 stride,
                                       const void *data);

@@ -1089,12 +1084,12 @@
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageDelete mlib_ImageDelete
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-void  __mlib_ImageDelete(mlib_image *img);
+JNIEXPORT void JNICALL
+__mlib_ImageDelete(mlib_image *img);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageSetPaddings mlib_ImageSetPaddings
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */

@@ -1419,12 +1414,12 @@
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageAffine mlib_ImageAffine
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageAffine(mlib_image *dst,
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageAffine(mlib_image *dst,
                                 const mlib_image *src,
                                 const mlib_d64 *mtx,
                                 mlib_filter filter,
                                 mlib_edge edge);
 

@@ -2300,12 +2295,12 @@
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageLookUp mlib_ImageLookUp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageLookUp(mlib_image *dst,
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageLookUp(mlib_image *dst,
                                 const mlib_image *src,
                                 const void **table);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )

@@ -2629,24 +2624,24 @@
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvKernelConvert mlib_ImageConvKernelConvert
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
                                            mlib_s32 *iscale,
                                            const mlib_d64 *fkernel,
                                            mlib_s32 m,
                                            mlib_s32 n,
                                            mlib_type type);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvMxN mlib_ImageConvMxN
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageConvMxN(mlib_image *dst,
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageConvMxN(mlib_image *dst,
                                  const mlib_image *src,
                                  const mlib_s32 *kernel,
                                  mlib_s32 m,
                                  mlib_s32 n,
                                  mlib_s32 dm,
< prev index next >