From a8f64ad3543d5e2ebe5cb1e55203fe3ba23ae6f4 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 13 Jul 2018 01:44:11 +0300
Subject: [PATCH] log file name for IDEA-195520

---
 .../intellij/images/index/ImageInfoIndex.java    |  2 +-
 .../intellij/images/util/ImageInfoReader.java    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/images/src/org/intellij/images/index/ImageInfoIndex.java b/images/src/org/intellij/images/index/ImageInfoIndex.java
index 9c2b104c38d2..75ca42562388 100644
--- a/images/src/org/intellij/images/index/ImageInfoIndex.java
+++ b/images/src/org/intellij/images/index/ImageInfoIndex.java
@@ -56,7 +56,7 @@ public class ImageInfoIndex extends SingleEntryFileBasedIndexExtension<ImageInfo
   private final SingleEntryIndexer<ImageInfo> myDataIndexer = new SingleEntryIndexer<ImageInfo>(false) {
     @Override
     protected ImageInfo computeValue(@NotNull FileContent inputData) {
-      final ImageInfoReader.Info info = ImageInfoReader.getInfo(inputData.getContent());
+      ImageInfoReader.Info info = ImageInfoReader.getInfo(inputData.getContent(), inputData.getFileName());
       return info != null? new ImageInfo(info.width, info.height, info.bpp) : null;
     }
   };
diff --git a/images/src/org/intellij/images/util/ImageInfoReader.java b/images/src/org/intellij/images/util/ImageInfoReader.java
index 07ab81835bdb..133868d2c9e8 100644
--- a/images/src/org/intellij/images/util/ImageInfoReader.java
+++ b/images/src/org/intellij/images/util/ImageInfoReader.java
@@ -26,7 +26,6 @@ import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.stream.ImageInputStream;
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.util.Iterator;
 
 /**
@@ -39,12 +38,12 @@ public class ImageInfoReader {
   }
 
   @Nullable
-  public static Info getInfo(@NotNull String file) {
-    return read(new File(file));
+  public static Info getInfo(@NotNull byte[] data) {
+    return getInfo(data, null);
   }
 
   @Nullable
-  public static Info getInfo(@NotNull byte[] data) {
+  public static Info getInfo(@NotNull byte[] data, @Nullable String inputName) {
     for (int i = 0; i < Math.min(data.length, 100); i++) {
       byte b = data[i];
       if (b == '<') {
@@ -57,20 +56,21 @@ public class ImageInfoReader {
         break;
       }
     }
-    return read(new ByteArrayInputStream(data));
+    return read(new ByteArrayInputStream(data), inputName);
   }
 
   private static Info tryReadSvg(byte[] data) {
     try {
       Couple<Integer> couple = SVGLoader.loadInfo(null, new ByteArrayInputStream(data), 1.0f);
       return new Info(couple.first, couple.second, 32);
-    } catch (Throwable e) {
+    }
+    catch (Throwable e) {
       return null;
     }
   }
 
   @Nullable
-  private static Info read(@NotNull Object input) {
+  private static Info read(@NotNull Object input, @Nullable String inputName) {
     try (ImageInputStream iis = ImageIO.createImageInputStream(input)) {
       Iterator<ImageReader> it = ImageIO.getImageReaders(iis);
       ImageReader reader = it.hasNext() ? it.next() : null;
@@ -84,7 +84,7 @@ public class ImageInfoReader {
       }
     }
     catch (Throwable e) {
-      LOG.warn(e);
+      LOG.warn(inputName, e);
     }
     return null;
   }