MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

log file name for IDEA-195520

Browse Source
This commit is contained in:
Gregory.Shrago
2018-07-13 01:50:07 +03:00
parent 27a0e35347
commit a8f64ad354
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/src/org/intellij/images/index/ImageInfoIndex.java
+1 -1
View File
@@ -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;
}
};
images/src/org/intellij/images/util/ImageInfoReader.java
+8 -8
View File
@@ -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;
}