[libbluray-devel] Revert "BDGraphics.drawImageN(): limit source rectangle to source image"

hpi1 git at videolan.org
Sun Aug 3 09:32:48 CEST 2014


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Sun Aug  3 10:31:39 2014 +0300| [424e2882a2bdbb66b3134df78fdf365e07566862] | committer: hpi1

Revert "BDGraphics.drawImageN(): limit source rectangle to source image"

This reverts commit 317d41122d985903d6313dbd7b8763d428dfa465.

Conflicts:
	ChangeLog

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=424e2882a2bdbb66b3134df78fdf365e07566862
---

 ChangeLog                                           |    1 -
 src/libbluray/bdj/java/java/awt/BDGraphicsBase.java |    8 --------
 2 files changed, 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 75e1b50..6ea9309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@
 - Fix stream position when seamless angle change point is at clip boundary.
 - Fix Mac OS X jni compilation
 - Fix bd_seek() jumping outside of clip/playlist.
-- Fix out of array bounds exception in some BD-J menus
 
 2014-05-27: Version 0.6.0
 - Improved BD-J support (Most BD-J discs are correctly played).
diff --git a/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java b/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java
index d0a53c3..e8ddb7b 100644
--- a/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java
+++ b/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java
@@ -1037,14 +1037,6 @@ abstract class BDGraphicsBase extends Graphics2D implements ConstrainableGraphic
         if (dw < 0) dw = bdImage.width;
         if (dh < 0) dh = bdImage.height;
 
-        /* limit source rectangle width / height to source image */
-        if (sx + sw > bdImage.width) {
-            sw = bdImage.width - sx;
-        }
-        if (sy + sh > bdImage.height) {
-            sh = bdImage.height - sy;
-        }
-
         int   stride   = bdImage.width;
         int[] rgbArray = bdImage.getBdBackBuffer();
         int   bgColor  = 0;



More information about the libbluray-devel mailing list