X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Fmetadata%2FfileTypes%2FPicture.java;h=7a1ba39df99dd5b0d2447566ab1480988d300988;hb=52c7290c1d1a4f73df6f212fec87f8ae4d3a7248;hp=9a005af2fc02c16ff12bc6c74619408fb1c2f681;hpb=8b0fa37543a8ccd5e37d7e16f31b449f8f5440b7;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 9a005af..7a1ba39 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
@@ -1,33 +1,39 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012 -- 2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
+ * 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.ImageReader;
+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;
 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.*;
 import java.util.ArrayList;
 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,7 +111,21 @@ 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();
+        }
+    }
+
+    private static void makeJpegThumbnail(File inputFile, File outputFile, java.awt.Dimension preferredTargetDimensions)
+            throws IOException, ImageFormatError {
 
             final BufferedImage inputImage = getBufferedImage(inputFile);
 
@@ -122,7 +142,7 @@ public class Picture extends AbstractFile {
 
             final BufferedImage bufferedImage = new BufferedImage(
                     scaledImage.getWidth(null), scaledImage.getHeight(null),
-                    BufferedImage.TYPE_INT_RGB);
+                    TYPE_INT_RGB);
 
             final Graphics2D g = bufferedImage.createGraphics();
             g.drawImage(scaledImage, 0, 0, null);
@@ -130,11 +150,52 @@ public class Picture extends AbstractFile {
 
             ImageIO.write(bufferedImage, "jpg", out);
             out.close();
+    }
 
-        } catch (final Exception exception) {
-            System.out.println(exception.toString());
-            exception.printStackTrace();
+    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);
+
+        FileInputStream fiStream = new FileInputStream( inputFile );
+
+        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,9 +219,9 @@ 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);
@@ -177,7 +238,7 @@ public class Picture extends AbstractFile {
      */
     public String getRelativeThumbnailFileName(final Dimension targetDimension) {
         return FilePathParser.getFileNameWithoutExtension(fileName) + " ("
-                + computeThumbnailHash(targetDimension) + ").jpeg";
+                + computeThumbnailHash(targetDimension) + ")." + getFileExtension();
     }
 
     @Override