modules/graphics/src/main/native-glass/mac/GlassView.m
Print this page
@@ -657,11 +657,11 @@
* Class: com_sun_glass_ui_mac_MacView
* Method: _uploadPixelsDirect
* Signature: (JLjava/nio/Buffer;II)V
*/
JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacView__1uploadPixelsDirect
-(JNIEnv *env, jobject jView, jlong jPtr, jobject jBuffer, jint jWidth, jint jHeight, jfloat jScale)
+(JNIEnv *env, jobject jView, jlong jPtr, jobject jBuffer, jint jWidth, jint jHeight, jfloat jScaleX, jfloat jScaleY)
{
LOG("Java_com_sun_glass_ui_mac_MacView__1uploadPixelsDirect");
if (!jPtr) return;
GLASS_ASSERT_MAIN_JAVA_THREAD(env);
@@ -674,21 +674,21 @@
#endif
// must be in the middle of begin/end
if ((jWidth > 0) && (jHeight > 0))
{
- [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScale:(GLfloat)jScale withEnv:env];
+ [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScaleX:(GLfloat)jScaleX withScaleY:(GLfloat)jScaleY withEnv:env];
}
}
/*
* Class: com_sun_glass_ui_mac_MacView
* Method: _uploadPixelsByteArray
* Signature: (J[BIII)V
*/
JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacView__1uploadPixelsByteArray
-(JNIEnv *env, jobject jView, jlong jPtr, jbyteArray jArray, jint jOffset, jint jWidth, jint jHeight, jfloat jScale)
+(JNIEnv *env, jobject jView, jlong jPtr, jbyteArray jArray, jint jOffset, jint jWidth, jint jHeight, jfloat jScaleX, jfloat jScaleY)
{
LOG("Java_com_sun_glass_ui_mac_MacView__1uploadPixelsByteArray");
if (!jPtr) return;
GLASS_ASSERT_MAIN_JAVA_THREAD(env);
@@ -707,11 +707,11 @@
#endif
// must be in the middle of begin/end
if ((jWidth > 0) && (jHeight > 0))
{
- [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScale:(GLfloat)jScale withEnv:env];
+ [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScaleX:(GLfloat)jScaleX withScaleY:(GLfloat)jScaleY withEnv:env];
}
}
(*env)->ReleasePrimitiveArrayCritical(env, jArray, data, JNI_ABORT);
}
@@ -719,11 +719,11 @@
* Class: com_sun_glass_ui_mac_MacView
* Method: _uploadPixelsIntArray
* Signature: (J[IIII)V
*/
JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacView__1uploadPixelsIntArray
-(JNIEnv *env, jobject jView, jlong jPtr, jintArray jArray, jint jOffset, jint jWidth, jint jHeight, jfloat jScale)
+(JNIEnv *env, jobject jView, jlong jPtr, jintArray jArray, jint jOffset, jint jWidth, jint jHeight, jfloat jScaleX, jfloat jScaleY)
{
LOG("Java_com_sun_glass_ui_mac_MacView__1uploadPixelsIntArray");
if (!jPtr) return;
GLASS_ASSERT_MAIN_JAVA_THREAD(env);
@@ -742,11 +742,11 @@
#endif
// must be in the middle of begin/end
if ((jWidth > 0) && (jHeight > 0))
{
- [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScale:(GLfloat)jScale withEnv:env];
+ [view pushPixels:pixels withWidth:(GLuint)jWidth withHeight:(GLuint)jHeight withScaleX:(GLfloat)jScaleX withScaleY:(GLfloat)jScaleY withEnv:env];
}
}
(*env)->ReleasePrimitiveArrayCritical(env, jArray, data, JNI_ABORT);
}