Merge branch 'master' into webp

Author: riccardobl

jme3-plugins/src/main/java/com/jme3/texture/plugins/StbImageLoader.java

@@ -34,7 +34,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
         try(InputStream is = assetInfo.openStream()) {
             byte[] data = ByteUtils.getByteContent(is);
-            ByteBuffer buffer = BufferUtils.createByteBuffer(data);
+            ByteBuffer buffer = ByteBuffer.wrap(data);
             stbImage.setConvertIphonePngToRgb(true);
             stbImage.setUnpremultiplyOnLoad(true);
 
@@ -110,7 +110,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
             ByteBuffer jmeImageBuffer = convertImageData(imgData, jmeFormat);
 
-            Image jmeImage = new Image(jmeFormat, width, height, jmeImageBuffer, sRGB?ColorSpace.sRGB:ColorSpace.Linear);
+            Image jmeImage = new Image(jmeFormat, width, height, jmeImageBuffer, sRGB ? ColorSpace.sRGB : ColorSpace.Linear);
             return jmeImage;
         }
     }