changeset 7297:d202ef8951c9

Fix RT-36341: Loading image with no extension on retina Mac gets index OOB exception Reviewed by: kcr
author flar <James.Graham@oracle.com>
date Tue, 17 Jun 2014 00:10:29 -0700
parents d7f475ce3a2a
children 027cf67a60cf
files modules/graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java modules/graphics/src/test/java/com/sun/javafx/iio/ImageStorageTest.java modules/graphics/src/test/resources/com/sun/javafx/iio/testpngnoextension
diffstat 3 files changed, 41 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java	Mon Jun 16 17:27:37 2014 -0400
+++ b/modules/graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java	Tue Jun 17 00:10:29 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, 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
@@ -300,7 +300,8 @@
                 if (pixelScale > 1.9f) {
                     // Use Mac Retina conventions for > 1.9f
                     StringBuilder new_input = new StringBuilder();
-                    final int last_dot_idx = input.lastIndexOf(".");
+                    int last_dot_idx = input.lastIndexOf(".");
+                    if (last_dot_idx < 0) last_dot_idx = input.length();
                     new_input.append(input.substring(0, last_dot_idx));
                     new_input.append("@2x");
                     new_input.append(input.substring(last_dot_idx));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/graphics/src/test/java/com/sun/javafx/iio/ImageStorageTest.java	Tue Jun 17 00:10:29 2014 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014, 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.iio;
+
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+public class ImageStorageTest {
+    static final String PATH = "file:src/test/resources/com/sun/javafx/iio/";
+    @Test
+    public void createImageFromNoExtensionURL() throws ImageStorageException {
+        assertNotNull(ImageStorage.loadAll(PATH+"testpngnoextension",
+                                           null, 0, 0, true, 2.0f, true));
+    }
+}
Binary file modules/graphics/src/test/resources/com/sun/javafx/iio/testpngnoextension has changed