X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Fmetadata%2FfileTypes%2FPicture.java;h=9604211781e43e96558a800bb70e1a0e6a3ce389;hb=55413b4e5a1c3fb76d77e20ea67fd29853083c7e;hp=ae220712167d35b120178d1aa95f3faf10491323;hpb=567410640f4e0428caf9de9fc83df4c73f0e5067;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
index ae22071..9604211 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java
@@ -5,16 +5,22 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public License
  * or later as published by the Free Software Foundation.
-*/
+ */
 
 package eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes;
 
 import eu.svjatoslav.commons.file.FilePathParser;
+import eu.svjatoslav.commons.file.IOHelper;
 import eu.svjatoslav.meviz.htmlindexer.Constants;
+import eu.svjatoslav.meviz.htmlindexer.GifSequenceWriter;
+import eu.svjatoslav.meviz.htmlindexer.ImageFormatError;
 import eu.svjatoslav.meviz.htmlindexer.Utils;
 import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 
-import javax.imageio.ImageIO;
+import javax.imageio.*;
+import javax.imageio.stream.FileImageOutputStream;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -22,12 +28,13 @@ import java.awt.image.FilteredImageSource;
 import java.awt.image.ImageFilter;
 import java.awt.image.ImageProducer;
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import static eu.svjatoslav.meviz.htmlindexer.Utils.getBufferedImage;
+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
 
 public class Picture extends AbstractFile {
 
@@ -105,36 +112,99 @@ public class Picture extends AbstractFile {
                                      final File outputFile,
                                      final java.awt.Dimension preferredTargetDimensions) {
 
+        String fileExtension = FilePathParser.getFileExtension(inputFile.getName());
+
         try {
+            if ("gif".equalsIgnoreCase(fileExtension))
+                makeGifThumbnail(inputFile, outputFile, preferredTargetDimensions);
+            else
+                makeJpegThumbnail(inputFile, outputFile, preferredTargetDimensions);
+        } catch (final Exception exception) {
+            System.out.println(exception.toString());
+            exception.printStackTrace();
+        }
+    }
 
-            final BufferedImage inputImage = getBufferedImage(inputFile);
+    private static void makeJpegThumbnail(File inputFile, File outputFile, java.awt.Dimension preferredTargetDimensions)
+            throws IOException, ImageFormatError {
 
-            final java.awt.Dimension sourceImageDimension = new java.awt.Dimension(
-                    inputImage.getWidth(), inputImage.getHeight());
+        final BufferedImage inputImage = getBufferedImage(inputFile);
 
-            final java.awt.Dimension targetDimensions = getTargetThumbnailDimension(
-                    sourceImageDimension, preferredTargetDimensions);
+        final java.awt.Dimension sourceImageDimension = new java.awt.Dimension(
+                inputImage.getWidth(), inputImage.getHeight());
 
-            final OutputStream out = new FileOutputStream(outputFile);
+        final java.awt.Dimension targetDimensions = getTargetThumbnailDimension(
+                sourceImageDimension, preferredTargetDimensions);
 
-            final Image scaledImage = scaleImage(inputImage,
-                    targetDimensions.width, targetDimensions.height);
 
-            final BufferedImage bufferedImage = new BufferedImage(
-                    scaledImage.getWidth(null), scaledImage.getHeight(null),
-                    BufferedImage.TYPE_INT_RGB);
+        final Image scaledImage = scaleImage(inputImage,
+                targetDimensions.width, targetDimensions.height);
 
-            final Graphics2D g = bufferedImage.createGraphics();
-            g.drawImage(scaledImage, 0, 0, null);
-            g.dispose();
+        final BufferedImage bufferedImage = new BufferedImage(
+                scaledImage.getWidth(null), scaledImage.getHeight(null),
+                TYPE_INT_RGB);
 
-            ImageIO.write(bufferedImage, "jpg", out);
-            out.close();
+        final Graphics2D g = bufferedImage.createGraphics();
+        g.drawImage(scaledImage, 0, 0, null);
+        g.dispose();
 
-        } catch (final Exception exception) {
-            System.out.println(exception.toString());
-            exception.printStackTrace();
+
+
+        ImageOutputStream  ios =  ImageIO.createImageOutputStream(outputFile);
+        Iterator<ImageWriter> iter = ImageIO.getImageWritersByFormatName("webp");
+        ImageWriter writer = iter.next();
+        ImageWriteParam iwp = writer.getDefaultWriteParam();
+        iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        iwp.setCompressionType("Lossy");
+        iwp.setCompressionQuality(0.8f);
+
+        writer.setOutput(ios);
+        writer.write(null, new IIOImage(bufferedImage,null,null),iwp);
+        writer.dispose();
+    }
+
+    private static void makeGifThumbnail(
+            File inputFile, File outputFile, java.awt.Dimension preferredTargetDimensions) throws IOException {
+        ImageIcon imageIcon = new ImageIcon(IOHelper.getFileContents(inputFile));
+
+        final java.awt.Dimension sourceImageDimension = new java.awt.Dimension(
+                imageIcon.getIconWidth(), imageIcon.getIconHeight());
+
+        System.out.println("Source image dimensions:" + sourceImageDimension);
+
+        final java.awt.Dimension targetDimensions = getTargetThumbnailDimension(
+                sourceImageDimension, preferredTargetDimensions);
+
+        System.out.println("Desired target image dimensions:" + targetDimensions);
+
+        ImageReader reader = ImageIO.getImageReadersByFormatName("gif").next();
+        ImageInputStream stream = ImageIO.createImageInputStream(inputFile);
+        reader.setInput(stream);
+
+        Utils.ImageFrame[] frames = Utils.readGIF(reader);
+        for (Utils.ImageFrame frame : frames) {
+            Image scaleImage = scaleImage(frame.image, targetDimensions.width, targetDimensions.height);
+            BufferedImage bImage = new BufferedImage(
+                    targetDimensions.width, targetDimensions.height, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D bGr = bImage.createGraphics();
+            bGr.drawImage(scaleImage, 0, 0, null);
+            bGr.dispose();
+            frame.image = bImage;
         }
+
+        ImageOutputStream output = new FileImageOutputStream(outputFile);
+
+        GifSequenceWriter writer =
+                new GifSequenceWriter(output, frames[0].image.getType(), frames[0].getDelay(), true);
+
+        writer.writeToSequence(frames[0].image);
+        for (int i = 1; i < frames.length; i++) {
+            BufferedImage nextImage = frames[i].image;
+            writer.writeToSequence(nextImage);
+        }
+
+        writer.close();
+        output.close();
     }
 
     /**
@@ -158,12 +228,11 @@ public class Picture extends AbstractFile {
 
         // compute new thumbnails hash number
         final String forMagicHash = fileName + " "
-                + String.valueOf(targetDimension.width) + " "
-                + String.valueOf(targetDimension.height) + " "
-                + String.valueOf(getFileLength()) + " "
+                + targetDimension.width + " "
+                + targetDimension.height + " "
+                + getFileLength() + " "
                 + Constants.THUMBNAIL_VERSION;
 
-        // System.out.println("Computing hash from: " + forMagicHash);
         return Utils.getStringCrcAsHex(forMagicHash);
     }
 
@@ -176,8 +245,10 @@ public class Picture extends AbstractFile {
      * relative to designated thumbnails directory within parent directory.
      */
     public String getRelativeThumbnailFileName(final Dimension targetDimension) {
+        String thumbnailExtension = "gif".equalsIgnoreCase(getFileExtension()) ? "gif" : "webp";
+
         return FilePathParser.getFileNameWithoutExtension(fileName) + " ("
-                + computeThumbnailHash(targetDimension) + ").jpeg";
+                + computeThumbnailHash(targetDimension) + ")." + thumbnailExtension;
     }
 
     @Override