modules/javafx.graphics/src/main/native-prism-sw/JPiscesRenderer.c

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2017, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 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
*** 244,254 ****
   * Signature: (I[IIILcom/sun/pisces/Transform6;Z)V
   */
  JNIEXPORT void JNICALL Java_com_sun_pisces_PiscesRenderer_setTextureImpl
    (JNIEnv *env, jobject this, jint imageType, jintArray dataArray,
        jint width, jint height, jint stride,
!       jobject jTransform, jboolean repeat, jboolean hasAlpha)
  {
      Renderer* rdr;
      Transform6 textureTransform;
      jint *data;
  
--- 244,254 ----
   * Signature: (I[IIILcom/sun/pisces/Transform6;Z)V
   */
  JNIEXPORT void JNICALL Java_com_sun_pisces_PiscesRenderer_setTextureImpl
    (JNIEnv *env, jobject this, jint imageType, jintArray dataArray,
        jint width, jint height, jint stride,
!       jobject jTransform, jboolean repeat, jboolean linearFiltering, jboolean hasAlpha)
  {
      Renderer* rdr;
      Transform6 textureTransform;
      jint *data;
  
*** 267,277 ****
                  for (i = 0; i < height; i++) {
                      memcpy(alloc_data + (i*width), data + (i*stride), sizeof(jint) * width);
                  }
              }
              renderer_setTexture(rdr, IMAGE_MODE_NORMAL,
!                 alloc_data, width, height, width, repeat, JNI_TRUE,
                  &textureTransform, JNI_TRUE, hasAlpha,
                  0, 0, width-1, height-1);
          } else {
              setMemErrorFlag();
          }
--- 267,277 ----
                  for (i = 0; i < height; i++) {
                      memcpy(alloc_data + (i*width), data + (i*stride), sizeof(jint) * width);
                  }
              }
              renderer_setTexture(rdr, IMAGE_MODE_NORMAL,
!                 alloc_data, width, height, width, repeat, linearFiltering,
                  &textureTransform, JNI_TRUE, hasAlpha,
                  0, 0, width-1, height-1);
          } else {
              setMemErrorFlag();
          }
*** 655,665 ****
   * Signature: (I[IIIIILcom/sun/pisces/Transform6;ZIIII)V
   */
  JNIEXPORT void JNICALL Java_com_sun_pisces_PiscesRenderer_drawImageImpl
  (JNIEnv *env, jobject this, jint imageType, jint imageMode,
      jintArray dataArray, jint width, jint height, jint offset, jint stride,
!     jobject jTransform, jboolean repeat, jint bboxX, jint bboxY, jint bboxW, jint bboxH,
      jint lEdge, jint rEdge, jint tEdge, jint bEdge,
      jint txMin, jint tyMin, jint txMax, jint tyMax,
      jboolean hasAlpha)
  {
      Renderer* rdr;
--- 655,666 ----
   * Signature: (I[IIIIILcom/sun/pisces/Transform6;ZIIII)V
   */
  JNIEXPORT void JNICALL Java_com_sun_pisces_PiscesRenderer_drawImageImpl
  (JNIEnv *env, jobject this, jint imageType, jint imageMode,
      jintArray dataArray, jint width, jint height, jint offset, jint stride,
!     jobject jTransform, jboolean repeat, jboolean linearFiltering,
!     jint bboxX, jint bboxY, jint bboxW, jint bboxH,
      jint lEdge, jint rEdge, jint tEdge, jint bEdge,
      jint txMin, jint tyMin, jint txMax, jint tyMax,
      jboolean hasAlpha)
  {
      Renderer* rdr;
*** 670,680 ****
      if (data != NULL) {
          Transform6 textureTransform;
  
          transform_get6(&textureTransform, env, jTransform);
          renderer_setTexture(rdr, imageMode, data + offset, width, height, stride,
!             repeat, JNI_TRUE, &textureTransform, JNI_FALSE, hasAlpha,
              txMin, tyMin, txMax, tyMax);
  
          fillRect(env, this, rdr,
              bboxX, bboxY, bboxW, bboxH,
              lEdge, rEdge, tEdge, bEdge);
--- 671,681 ----
      if (data != NULL) {
          Transform6 textureTransform;
  
          transform_get6(&textureTransform, env, jTransform);
          renderer_setTexture(rdr, imageMode, data + offset, width, height, stride,
!             repeat, linearFiltering, &textureTransform, JNI_FALSE, hasAlpha,
              txMin, tyMin, txMax, tyMax);
  
          fillRect(env, this, rdr,
              bboxX, bboxY, bboxW, bboxH,
              lEdge, rEdge, tEdge, bEdge);