summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam NAILI2018-01-09 15:45:46 +0100
committerAdam NAILI2018-01-09 15:45:46 +0100
commit2936ff4e0ef52effb1d1a780bcf847b235fe60f3 (patch)
tree0f9b8f551fa1ab4c7b91fe0a062bfdd512728ff9
parent461164dd4adefc0036d1e244fbd0e5e805bbef9d (diff)
parentec4161223661a4b3d01719dc40eaa85c1dce15d7 (diff)
downloadmorpher-2936ff4e0ef52effb1d1a780bcf847b235fe60f3.tar.gz
Merge branch 'master' of https://git-etud.u-pem.fr/upem-c-morphing
-rw-r--r--src/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 7757f9a..d791a93 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,16 +1,15 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <stdio.h> 2#include <stdio.h>
3#include <unistd.h>
4#include <getopt.h> 3#include <getopt.h>
4#include <MLV/MLV_path.h>
5#include "gui/gui.h" 5#include "gui/gui.h"
6#include "MLV/MLV_path.h"
7 6
8int main(int argc, char **argv) { 7int main(int argc, char **argv) {
9 int opt = 0; 8 int opt = 0;
10 int help = -1; 9 int help = -1;
11 static struct option long_options[] = { 10 static struct option long_options[] = {
12 {"help", 0, 0, 'h'}, 11 {"help", 0, 0, 'h'},
13 {0, 0, 0, 0} 12 {0, 0, 0, 0}
14 }; 13 };
15 int long_index = 0; 14 int long_index = 0;
16 /*Option handling*/ 15 /*Option handling*/
@@ -25,7 +24,7 @@ int main(int argc, char **argv) {
25 } 24 }
26 if (help == 0) { 25 if (help == 0) {
27 printf( 26 printf(
28 "--Morphing's Help--\nTo use the morphing, you need to put two correct paths to image files.\n\nCorrect image format :\nICO(Icon)/CUR(Cursor)/BMP, PNM (PPM/PGM/PBM), XPM, LBM(IFF ILBM), PCX, GIF, JPEG, PNG, TGA, TIFF, and XV.\n\nMorphing made by:\n Pacien TRAN-GIRARD and Adam NAILI\n"); 27 "--Morphing's Help--\nTo use the morphing, you need to put two correct paths to image files.\n\nCorrect image format :\nICO(Icon)/CUR(Cursor)/BMP, PNM (PPM/PGM/PBM), XPM, LBM(IFF ILBM), PCX, GIF, JPEG, PNG, TGA, TIFF, and XV.\n\nMorphing made by:\n Pacien TRAN-GIRARD and Adam NAILI\n");
29 } else { 28 } else {
30 int nbArg = argc - optind; 29 int nbArg = argc - optind;
31 if (nbArg < 2) { 30 if (nbArg < 2) {