plug-ins/bmp/* plug-ins/faxg3/* plug-ins/fits/* plug-ins/fli/*

2008-08-11  Michael Natterer  <mitch@gimp.org>

	* plug-ins/bmp/*
	* plug-ins/faxg3/*
	* plug-ins/fits/*
	* plug-ins/fli/*
	* plug-ins/ico/*
	* plug-ins/jpeg/*
	* plug-ins/psd/*
	* plug-ins/sgi/*
	* plug-ins/uri/*
	* plug-ins/xjt/*: removed these...

	* plug-ins/file-bmp/*
	* plug-ins/file-faxg3/*
	* plug-ins/file-fits/*
	* plug-ins/file-fli/*
	* plug-ins/file-ico/*
	* plug-ins/file-jpeg/*
	* plug-ins/file-psd/*
	* plug-ins/file-sgi/*
	* plug-ins/file-uri/*
	* plug-ins/file-xjt/*: and moved them here. Changed executable
	names to "file-foo".

	* plug-ins/Makefile.am: changed accordingly.

	* plug-ins/common/*: rename all file plug-ins to file-foo.c. Get
	rid of the names "poppler" and "postscript" and call them
	"file-pdf" and "file-ps" because the conflict with standard
	autofoo targets is gone.

	* plug-ins/common/plugin-defs.pl: changed accordingly.

	* plug-ins/common/mkgen.pl: make sure cflags variables are named
	"PLUG_IN_NAME_CFLAGS" and not "PLUG-IN-NAME_CFLAGS"

	* plug-ins/common/Makefile.am: regenerated.

	* configure.in: change folders and variable names to match above
	changes.


svn path=/trunk/; revision=26494

ChangeLog

@@ -1,3 +1,45 @@
+2008-08-11  Michael Natterer  <mitch@gimp.org>
+
+	* plug-ins/bmp/*
+	* plug-ins/faxg3/*
+	* plug-ins/fits/*
+	* plug-ins/fli/*
+	* plug-ins/ico/*
+	* plug-ins/jpeg/*
+	* plug-ins/psd/*
+	* plug-ins/sgi/*
+	* plug-ins/uri/*
+	* plug-ins/xjt/*: removed these...
+
+	* plug-ins/file-bmp/*
+	* plug-ins/file-faxg3/*
+	* plug-ins/file-fits/*
+	* plug-ins/file-fli/*
+	* plug-ins/file-ico/*
+	* plug-ins/file-jpeg/*
+	* plug-ins/file-psd/*
+	* plug-ins/file-sgi/*
+	* plug-ins/file-uri/*
+	* plug-ins/file-xjt/*: and moved them here. Changed executable
+	names to "file-foo".
+
+	* plug-ins/Makefile.am: changed accordingly.
+
+	* plug-ins/common/*: rename all file plug-ins to file-foo.c. Get
+	rid of the names "poppler" and "postscript" and call them
+	"file-pdf" and "file-ps" because the conflict with standard
+	autofoo targets is gone.
+
+	* plug-ins/common/plugin-defs.pl: changed accordingly.
+
+	* plug-ins/common/mkgen.pl: make sure cflags variables are named
+	"PLUG_IN_NAME_CFLAGS" and not "PLUG-IN-NAME_CFLAGS"
+
+	* plug-ins/common/Makefile.am: regenerated.
+
+	* configure.in: change folders and variable names to match above
+	changes.
+
 2008-08-11  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimptexttool.c: minor coding style cleanups.
@@ -151,7 +193,7 @@
 	* modules/colorsel_wheel.c: new module using the GtkHSV widget
 	which was originally developed from above triangle selector.
 
-	* modules/Makefile.am: chaged accordingly.
+	* modules/Makefile.am: changed accordingly.
 
 2008-08-08  Sven Neumann  <sven@gimp.org>
 

configure.in

@@ -998,15 +998,15 @@ AC_ARG_WITH(libtiff,  [  --without-libtiff       build without TIFF support])
     have_libtiff=yes
     AC_CHECK_LIB(tiff, TIFFReadScanline,
       [AC_CHECK_HEADER(tiffio.h,
-	TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff',
+	FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff',
 	[have_libtiff="no (TIFF header files not found)"])],
       [AC_CHECK_LIB(tiff, TIFFWriteScanline,
 	[AC_CHECK_HEADER(tiffio.h,
-          TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
+          FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
 	  [have_libtiff="no (TIFF header files not found)"])],
 	[AC_CHECK_LIB(tiff34, TIFFFlushData,
 	  [AC_CHECK_HEADER(tiffio.h,
-            TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
+            FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
 	    [have_libtiff="no (TIFF header files not found)"])],
         [have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
   fi
@@ -1021,8 +1021,8 @@ AC_ARG_WITH(libtiff,  [  --without-libtiff       build without TIFF support])
     MIME_TYPES="$MIME_TYPES;image/tiff"
   fi
 
-AC_SUBST(TIFF_LOAD)
+AC_SUBST(FILE_TIFF_LOAD)
-AC_SUBST(TIFF_SAVE)
+AC_SUBST(FILE_TIFF_SAVE)
 AC_SUBST(LIBTIFF)
 
 
@@ -1094,7 +1094,7 @@ have_zlib=yes
 if test -z "$LIBZ"; then
   AC_CHECK_LIB(z, gzsetparams,
     [AC_CHECK_HEADER(zlib.h,
-      PSP='psp$(EXEEXT)'; LIBZ='-lz',
+      FILE_PSP='file-psp$(EXEEXT)'; LIBZ='-lz',
       [have_zlib="no (ZLIB header files not found)"])],
     [have_zlib="no (ZLIB library not found)"])
 fi
@@ -1103,8 +1103,8 @@ if test "x$have_zlib" = xyes; then
   MIME_TYPES="$MIME_TYPES;image/x-psd"
 fi
 
+AC_SUBST(FILE_PSP)
 AC_SUBST(LIBZ)
-AC_SUBST(PSP)
 
 
 ##################
@@ -1116,7 +1116,7 @@ AC_ARG_WITH(libpng,  [  --without-libpng        build without PNG support])
 if test "x$with_libpng" != xno; then
   have_libpng=yes
   PKG_CHECK_MODULES(PNG, libpng,
-    PNG='png$(EXEEXT)'
+    FILE_PNG='file-png$(EXEEXT)'
     LIBPNG="$PNG_LIBS",
     [have_libpng="no (libpng not found)"
      AC_MSG_ERROR([
@@ -1128,7 +1128,7 @@ if test "x$have_libpng" = xyes; then
   MIME_TYPES="$MIME_TYPES;image/png;image/x-icon"
 fi
 
-AC_SUBST(PNG)
+AC_SUBST(FILE_PNG)
 AC_SUBST(LIBPNG)
 
 AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
@@ -1147,13 +1147,13 @@ AC_ARG_WITH(libmng,  [  --without-libmng        build without MNG support])
       [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
       [have_libmng="no (MNG library not found)"], -lz -lm)
     if test "$mng_ok" = yes; then
-      MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
+      FILE_MNG='file-mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
     else
       have_libmng="no (MNG header file not found)"
     fi
   fi
 
-AC_SUBST(MNG)
+AC_SUBST(FILE_MNG)
 AC_SUBST(LIBMNG)
 
 
@@ -1187,12 +1187,12 @@ if test "x$with_aa" != xno && test -z "$LIBAA"; then
   have_libaa=yes
   AC_CHECK_LIB(aa, aa_printf,
     [AC_CHECK_HEADER(aalib.h,
-      AA='aa$(EXEEXT)'; LIBAA='-laa',
+      FILE_AA='file-aa$(EXEEXT)'; LIBAA='-laa',
       [have_libaa="no (AA header file not found)"])],
     [have_libaa="no (AA library not found)"])
 fi
 
-AC_SUBST(AA)
+AC_SUBST(FILE_AA)
 AC_SUBST(LIBAA)
 
 
@@ -1211,7 +1211,7 @@ have_libxpm=yes
 if test -z "$LIBXPM"; then
   AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
     [AC_CHECK_HEADER(X11/xpm.h,
-      XPM='xpm$(EXEEXT)'; LIBXPM="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
+      FILE_XPM='file-xpm$(EXEEXT)'; LIBXPM="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
       [have_libxpm="no (XPM header file not found)"])],
     [have_libxpm="no (XPM library not found)"], $X_PRE_LIBS $lib_X11)
 fi
@@ -1222,7 +1222,7 @@ if test "x$have_libxpm" = xyes; then
   MIME_TYPES="$MIME_TYPES;image/x-xpixmap"
 fi
 
-AC_SUBST(XPM)
+AC_SUBST(FILE_XPM)
 AC_SUBST(LIBXPM)
 
 
@@ -1263,7 +1263,7 @@ have_librsvg=no
 if test "x$with_librsvg" != xno; then
   have_librsvg=yes
   PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
-    SVG='svg$(EXEEXT)'
+    FILE_SVG='file-svg$(EXEEXT)'
     LIBSVG=$SVG_LIBS,
     have_librsvg="no (librsvg not found)")
 else
@@ -1274,7 +1274,7 @@ if test "x$have_librsvg" = xyes; then
   MIME_TYPES="$MIME_TYPES;image/svg+xml"
 fi
 
-AC_SUBST(SVG)
+AC_SUBST(FILE_SVG)
 AC_SUBST(LIBSVG)
 
 
@@ -1301,7 +1301,7 @@ AC_ARG_WITH(poppler,[  --without-poppler       build without poppler support])
 if test "x$with_poppler" != xno; then
   PKG_CHECK_MODULES(POPPLER,
     poppler-glib >= poppler_required_version gthread-2.0,
-    POPPLER='poppler$(EXEEXT)'
+    FILE_PDF='file-pdf$(EXEEXT)'
     LIBPOPPLER=$POPPLER_LIBS
     AC_DEFINE(HAVE_POPPLER, 1, [Define to 1 if libpoppler is available])
     have_poppler=yes,
@@ -1310,7 +1310,7 @@ else
   have_poppler="Using PostScript plug-in (libpoppler support disabled)"
 fi
 
-AC_SUBST(POPPLER)
+AC_SUBST(FILE_PDF)
 AC_SUBST(LIBPOPPLER)
 
 
@@ -1407,7 +1407,7 @@ if test "x$WMF_CONFIG" != "xno" ; then
   wmf_version=`$WMF_CONFIG --version`
   if expr $wmf_version \>= wmf_required_version >/dev/null; then
     AC_MSG_RESULT([yes (version $wmf_version)])
-    WMF='wmf$(EXEEXT)'
+    FILE_WMF='file-wmf$(EXEEXT)'
     LIBWMF=`$WMF_CONFIG --libs`
     WMF_CFLAGS=`$WMF_CONFIG --cflags`
   else
@@ -1421,9 +1421,9 @@ if test "x$have_libwmf" = xyes; then
   MIME_TYPES="$MIME_TYPES;image/x-wmf"
 fi
 
-AC_SUBST(LIBWMF)
+AC_SUBST(FILE_WMF)
 AC_SUBST(WMF_CFLAGS)
-AC_SUBST(WMF)
+AC_SUBST(LIBWMF)
 
 
 ################
@@ -1984,32 +1984,35 @@ app/vectors/Makefile
 app/widgets/Makefile
 app/xcf/Makefile
 plug-ins/Makefile
-plug-ins/bmp/Makefile
 plug-ins/color-rotate/Makefile
 plug-ins/color-rotate/images/Makefile
-plug-ins/common/Makefile
+plug-ins/file-bmp/Makefile
-plug-ins/faxg3/Makefile
+plug-ins/file-faxg3/Makefile
-plug-ins/fits/Makefile
+plug-ins/file-fits/Makefile
+plug-ins/file-fli/Makefile
+plug-ins/file-ico/Makefile
+plug-ins/file-jpeg/Makefile
+plug-ins/file-psd/Makefile
+plug-ins/file-sgi/Makefile
+plug-ins/file-uri/Makefile
+plug-ins/file-xjt/Makefile
 plug-ins/flame/Makefile
-plug-ins/fli/Makefile
 plug-ins/fractal-explorer/Makefile
 plug-ins/fractal-explorer/examples/Makefile
 plug-ins/gfig/Makefile
 plug-ins/gfig/gfig-examples/Makefile
 plug-ins/gfig/images/Makefile
-plug-ins/gradient-flare/Makefile
-plug-ins/gradient-flare/flares/Makefile
 plug-ins/gimpressionist/Brushes/Makefile
 plug-ins/gimpressionist/Makefile
 plug-ins/gimpressionist/Paper/Makefile
 plug-ins/gimpressionist/Presets/Makefile
+plug-ins/gradient-flare/Makefile
+plug-ins/gradient-flare/flares/Makefile
 plug-ins/help-browser/Makefile
 plug-ins/help/Makefile
-plug-ins/ico/Makefile
 plug-ins/ifs-compose/Makefile
 plug-ins/imagemap/Makefile
 plug-ins/imagemap/images/Makefile
-plug-ins/jpeg/Makefile
 plug-ins/lighting/Makefile
 plug-ins/lighting/images/Makefile
 plug-ins/map-object/Makefile
@@ -2017,7 +2020,6 @@ plug-ins/maze/Makefile
 plug-ins/metadata/Makefile
 plug-ins/pagecurl/Makefile
 plug-ins/print/Makefile
-plug-ins/psd/Makefile
 plug-ins/pygimp/Makefile
 plug-ins/pygimp/plug-ins/Makefile
 plug-ins/script-fu/Makefile
@@ -2027,11 +2029,9 @@ plug-ins/script-fu/scripts/Makefile
 plug-ins/script-fu/scripts/images/Makefile
 plug-ins/script-fu/tinyscheme/Makefile
 plug-ins/selection-to-path/Makefile
-plug-ins/sgi/Makefile
 plug-ins/twain/Makefile
-plug-ins/uri/Makefile
 plug-ins/win-snap/Makefile
-plug-ins/xjt/Makefile
+plug-ins/common/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/app/Makefile

plug-ins/Makefile.am

@@ -9,7 +9,7 @@ help_browser = help-browser
 endif
 
 if BUILD_JPEG
-jpeg = jpeg
+file_jpeg = file-jpeg
 endif
 
 if BUILD_PRINT
@@ -29,54 +29,54 @@ twain = twain
 endif
 
 if HAVE_PNG
-ico = ico
+file_ico = file-ico
 endif
 
 if OS_WIN32
 twain = twain
 win_snap = win-snap
 if HAVE_LIBCURL
-uri = uri
+file_uri = file-uri
 endif
 else
-uri = uri
+file_uri = file-uri
 endif
 
 if BUILD_XJT
-xjt = xjt
+file_xjt = file-xjt
 endif
 
 
 SUBDIRS = \
 	$(script_fu)		\
 	$(pygimp)		\
-	bmp			\
 	color-rotate		\
-	faxg3			\
+	file-bmp		\
-	fits			\
+	file-faxg3		\
+	file-fits		\
+	file-fli		\
+	$(file_ico)		\
+	$(file_jpeg)		\
+	file-psd		\
+	file-sgi		\
+	$(file_uri)		\
+	$(file_xjt)		\
 	flame			\
-	fli			\
 	fractal-explorer	\
 	gfig			\
 	gimpressionist		\
 	gradient-flare		\
 	help			\
 	$(help_browser)		\
-	$(ico)			\
 	ifs-compose		\
 	imagemap		\
-	$(jpeg)                 \
 	lighting		\
 	map-object		\
 	maze			\
 	metadata		\
 	pagecurl		\
 	$(print)		\
-	psd			\
 	selection-to-path	\
-	sgi			\
 	$(twain)		\
-	$(uri)			\
 	$(win_snap)		\
-	$(xjt)			\
 	common

plug-ins/common/file-aa.c

@@ -39,7 +39,7 @@
 
 
 #define SAVE_PROC      "file-aa-save"
-#define PLUG_IN_BINARY "aa"
+#define PLUG_IN_BINARY "file-aa"
 
 
 /*

plug-ins/common/file-cel.c

@@ -34,7 +34,7 @@
 
 #define LOAD_PROC      "file-cel-load"
 #define SAVE_PROC      "file-cel-save"
-#define PLUG_IN_BINARY "cel"
+#define PLUG_IN_BINARY "file-cel"
 
 
 static void query (void);

plug-ins/common/file-csource.c

@@ -32,7 +32,7 @@
 
 
 #define SAVE_PROC      "file-csource-save"
-#define PLUG_IN_BINARY "csource"
+#define PLUG_IN_BINARY "file-csource"
 
 
 typedef struct

plug-ins/common/file-desktop-link.c

@@ -33,7 +33,7 @@
 
 
 #define LOAD_PROC      "file-desktop-link-load"
-#define PLUG_IN_BINARY "desktop-link"
+#define PLUG_IN_BINARY "file-desktop-link"
 
 
 static void    query      (void);

plug-ins/common/file-dicom.c

@@ -38,7 +38,7 @@
 
 #define LOAD_PROC      "file-dicom-load"
 #define SAVE_PROC      "file-dicom-save"
-#define PLUG_IN_BINARY "dicom"
+#define PLUG_IN_BINARY "file-dicom"
 
 
 /* A lot of Dicom images are wrongly encoded. By guessing the endian

plug-ins/common/file-gbr.c

@@ -69,7 +69,7 @@
 
 #define LOAD_PROC      "file-gbr-load"
 #define SAVE_PROC      "file-gbr-save"
-#define PLUG_IN_BINARY "gbr"
+#define PLUG_IN_BINARY "file-gbr"
 
 
 typedef struct

plug-ins/common/file-gif-save.c

@@ -40,7 +40,7 @@
 
 
 #define SAVE_PROC      "file-gif-save"
-#define PLUG_IN_BINARY "gif-save"
+#define PLUG_IN_BINARY "file-gif-save"
 
 
 /* Define only one of these to determine which kind of gif's you would like.

plug-ins/common/file-gih.c

@@ -78,7 +78,7 @@
 
 #define LOAD_PROC          "file-gih-load"
 #define SAVE_PROC          "file-gih-save"
-#define PLUG_IN_BINARY     "gih"
+#define PLUG_IN_BINARY     "file-gih"
 #define DUMMY_PATTERN_NAME "x"
 #define MAXDESCLEN         256
 

plug-ins/common/file-header.c

@@ -29,7 +29,7 @@
 
 
 #define SAVE_PROC      "file-header-save"
-#define PLUG_IN_BINARY "header"
+#define PLUG_IN_BINARY "file-header"
 
 
 /* Declare some local functions.

plug-ins/common/file-html-table.c

@@ -62,7 +62,7 @@
 
 
 #define SAVE_PROC      "file-gtm-save"
-#define PLUG_IN_BINARY "html-table"
+#define PLUG_IN_BINARY "file-html-table"
 
 /* Typedefs */
 

plug-ins/common/file-mng.c

@@ -94,7 +94,7 @@
 
 
 #define SAVE_PROC      "file-mng-save"
-#define PLUG_IN_BINARY "mng"
+#define PLUG_IN_BINARY "file-mng"
 #define SCALE_WIDTH    125
 
 enum

plug-ins/common/file-pat.c

@@ -52,7 +52,7 @@
 
 #define LOAD_PROC      "file-pat-load"
 #define SAVE_PROC      "file-pat-save"
-#define PLUG_IN_BINARY "pat"
+#define PLUG_IN_BINARY "file-pat"
 
 
 /*  local function prototypes  */

plug-ins/common/file-pcx.c

@@ -35,7 +35,7 @@
 
 #define LOAD_PROC      "file-pcx-load"
 #define SAVE_PROC      "file-pcx-save"
-#define PLUG_IN_BINARY "pcx"
+#define PLUG_IN_BINARY "file-pcx"
 
 /* Declare local functions.  */
 

plug-ins/common/file-pdf.c

@@ -35,7 +35,7 @@
 
 #define LOAD_PROC       "file-pdf-load"
 #define LOAD_THUMB_PROC "file-pdf-load-thumb"
-#define PLUG_IN_BINARY  "poppler"
+#define PLUG_IN_BINARY  "file-pdf"
 
 #define THUMBNAIL_SIZE  128
 

plug-ins/common/file-pix.c

@@ -55,7 +55,7 @@
 
 #define LOAD_PROC      "file-pix-load"
 #define SAVE_PROC      "file-pix-save"
-#define PLUG_IN_BINARY "pix"
+#define PLUG_IN_BINARY "file-pix"
 
 
 /* #define PIX_DEBUG */

plug-ins/common/file-png.c

@@ -63,7 +63,7 @@
 #define SAVE_DEFAULTS_PROC     "file-png-save-defaults"
 #define GET_DEFAULTS_PROC      "file-png-get-defaults"
 #define SET_DEFAULTS_PROC      "file-png-set-defaults"
-#define PLUG_IN_BINARY         "png"
+#define PLUG_IN_BINARY         "file-png"
 
 #define PLUG_IN_VERSION        "1.3.4 - 03 September 2002"
 #define SCALE_WIDTH            125

plug-ins/common/file-pnm.c

@@ -62,7 +62,7 @@
 #define PBM_SAVE_PROC  "file-pbm-save"
 #define PGM_SAVE_PROC  "file-pgm-save"
 #define PPM_SAVE_PROC  "file-ppm-save"
-#define PLUG_IN_BINARY "pnm"
+#define PLUG_IN_BINARY "file-pnm"
 
 
 /* Declare local data types

plug-ins/common/file-ps.c

@@ -114,7 +114,7 @@ static char dversio[] = "v1.17  19-Sep-2004";
 #define LOAD_PS_THUMB_PROC   "file-ps-load-thumb"
 #define SAVE_PS_PROC         "file-ps-save"
 #define SAVE_EPS_PROC        "file-eps-save"
-#define PLUG_IN_BINARY       "postscript"
+#define PLUG_IN_BINARY       "file-ps"
 
 
 #define STR_LENGTH 64

plug-ins/common/file-psp.c

@@ -28,7 +28,7 @@
 
 #define LOAD_PROC      "file-psp-load"
 #define SAVE_PROC      "file-psp-save"
-#define PLUG_IN_BINARY "psp"
+#define PLUG_IN_BINARY "file-psp"
 
 /* set to the level of debugging output you want, 0 for none */
 #define PSP_DEBUG 0

plug-ins/common/file-raw.c

@@ -49,7 +49,7 @@
 
 #define LOAD_PROC      "file-raw-load"
 #define SAVE_PROC      "file-raw-save"
-#define PLUG_IN_BINARY "raw"
+#define PLUG_IN_BINARY "file-raw"
 #define PREVIEW_SIZE   350
 
 

plug-ins/common/file-sunras.c

@@ -52,7 +52,7 @@
 
 #define LOAD_PROC      "file-sunras-load"
 #define SAVE_PROC      "file-sunras-save"
-#define PLUG_IN_BINARY "sunras"
+#define PLUG_IN_BINARY "file-sunras"
 
 
 typedef int WRITE_FUN(void*,size_t,size_t,FILE*);

plug-ins/common/file-svg.c

@@ -38,7 +38,7 @@
 
 #define LOAD_PROC               "file-svg-load"
 #define LOAD_THUMB_PROC         "file-svg-load-thumb"
-#define PLUG_IN_BINARY          "svg"
+#define PLUG_IN_BINARY          "file-svg"
 #define SVG_VERSION             "2.5.0"
 #define SVG_DEFAULT_RESOLUTION  90.0
 #define SVG_DEFAULT_SIZE        500

plug-ins/common/file-tga.c

@@ -95,7 +95,7 @@
 
 #define LOAD_PROC      "file-tga-load"
 #define SAVE_PROC      "file-tga-save"
-#define PLUG_IN_BINARY "tga"
+#define PLUG_IN_BINARY "file-tga"
 
 typedef enum
 {
@@ -433,38 +433,42 @@ load_image (const gchar *filename)
   gimp_progress_init_printf (_("Opening '%s'"),
                              gimp_filename_to_utf8 (filename));
 
-  if (!fseek (fp, -26L, SEEK_END)) { /* Is file big enough for a footer? */
+  /* Is file big enough for a footer? */
-    if (fread (footer, sizeof (footer), 1, fp) != 1)
+  if (!fseek (fp, -26L, SEEK_END))
-      {
+    {
-        g_message (_("Cannot read footer from '%s'"),
+      if (fread (footer, sizeof (footer), 1, fp) != 1)
-                   gimp_filename_to_utf8 (filename));
+        {
-        return -1;
+          g_message (_("Cannot read footer from '%s'"),
-      }
+                     gimp_filename_to_utf8 (filename));
-    else if (memcmp (footer + 8, magic, sizeof (magic)) == 0)
+          return -1;
-      {
+        }
-        /* Check the signature. */
+      else if (memcmp (footer + 8, magic, sizeof (magic)) == 0)
+        {
+          /* Check the signature. */
 
-        offset = footer[0] + (footer[1] * 256L) + (footer[2] * 65536L)
+          offset = (footer[0]          +
-                           + (footer[3] * 16777216L);
+                    footer[1] * 256L   +
+                    footer[2] * 65536L +
+                    footer[3] * 16777216L);
 
-        if (offset != 0)
+          if (offset != 0)
-          {
+            {
-            if (fseek (fp, offset, SEEK_SET) ||
+              if (fseek (fp, offset, SEEK_SET) ||
-                fread (extension, sizeof (extension), 1, fp) != 1)
+                  fread (extension, sizeof (extension), 1, fp) != 1)
-              {
+                {
-                g_message (_("Cannot read extension from '%s'"),
+                  g_message (_("Cannot read extension from '%s'"),
-                           gimp_filename_to_utf8 (filename));
+                             gimp_filename_to_utf8 (filename));
-                return -1;
+                  return -1;
-              }
+                }
-            /* Eventually actually handle version 2 TGA here */
+              /* Eventually actually handle version 2 TGA here */
-          }
+            }
-      }
+        }
-  }
+    }
 
   if (fseek (fp, 0, SEEK_SET) ||
       fread (header, sizeof (header), 1, fp) != 1)
     {
-      g_message ("Cannot read header from '%s'",
+      g_message (_("Cannot read header from '%s'"),
                  gimp_filename_to_utf8 (filename));
       return -1;
     }
@@ -508,7 +512,7 @@ load_image (const gchar *filename)
   info.colorMapLength = header[5] + header[6] * 256;
   info.colorMapSize   = header[7];
 
-  info.xOrigin = header[8] + header[9] * 256;
+  info.xOrigin = header[8]  + header[9] * 256;
   info.yOrigin = header[10] + header[11] * 256;
   info.width   = header[12] + header[13] * 256;
   info.height  = header[14] + header[15] * 256;
@@ -523,6 +527,16 @@ load_image (const gchar *filename)
   if (info.alphaBits == info.bpp)
     info.alphaBits = 0;
 
+  /* hack to handle yet another flavor of incorrect headers, see bug #540969 */
+  if (info.alphaBits == 0)
+    {
+      if (info.imageType == TGA_TYPE_COLOR && info.bpp == 32)
+        info.alphaBits = 8;
+
+      if (info.imageType == TGA_TYPE_GRAY && info.bpp == 16)
+        info.alphaBits = 8;
+    }
+
   switch (info.imageType)
     {
       case TGA_TYPE_MAPPED:
@@ -535,8 +549,8 @@ load_image (const gchar *filename)
           }
         break;
       case TGA_TYPE_COLOR:
-        if (info.bpp != 15 && info.bpp != 16 && info.bpp != 24
+        if (info.bpp != 15 && info.bpp != 16 &&
-            && info.bpp != 32)
+            info.bpp != 24 && info.bpp != 32)
           {
             g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
                        gimp_filename_to_utf8 (filename),
@@ -545,8 +559,8 @@ load_image (const gchar *filename)
           }
         break;
       case TGA_TYPE_GRAY:
-        if (info.bpp != 8
+        if (info.bpp != 8 &&
-            && (info.alphaBits != 8 || (info.bpp != 16 && info.bpp != 15)))
+            (info.alphaBits != 8 || (info.bpp != 16 && info.bpp != 15)))
           {
             g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
                        gimp_filename_to_utf8 (filename),
@@ -593,7 +607,9 @@ load_image (const gchar *filename)
     }
 
   image_ID = ReadImage (fp, &info, filename);
+
   fclose (fp);
+
   return image_ID;
 }
 

plug-ins/common/file-tiff-load.c

@@ -72,7 +72,7 @@
 
 
 #define LOAD_PROC      "file-tiff-load"
-#define PLUG_IN_BINARY "tiff-load"
+#define PLUG_IN_BINARY "file-tiff-load"
 
 
 typedef struct

plug-ins/common/file-tiff-save.c

@@ -73,7 +73,7 @@
 
 #define SAVE_PROC      "file-tiff-save"
 #define SAVE2_PROC     "file-tiff-save2"
-#define PLUG_IN_BINARY "tiff-save"
+#define PLUG_IN_BINARY "file-tiff-save"
 
 
 typedef struct

plug-ins/common/file-wmf.c

@@ -35,7 +35,7 @@
 
 #define LOAD_PROC               "file-wmf-load"
 #define LOAD_THUMB_PROC         "file-wmf-load-thumb"
-#define PLUG_IN_BINARY          "wmf"
+#define PLUG_IN_BINARY          "file-wmf"
 
 #define WMF_DEFAULT_RESOLUTION	90.0
 #define WMF_DEFAULT_SIZE        500

plug-ins/common/file-xbm.c

@@ -51,7 +51,7 @@
 
 #define LOAD_PROC      "file-xbm-load"
 #define SAVE_PROC      "file-xbm-save"
-#define PLUG_IN_BINARY "xbm"
+#define PLUG_IN_BINARY "file-xbm"
 
 
 /* Wear your GIMP with pride! */

plug-ins/common/file-xpm.c

@@ -71,7 +71,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`";
 
 #define LOAD_PROC      "file-xpm-load"
 #define SAVE_PROC      "file-xpm-save"
-#define PLUG_IN_BINARY "xpm"
+#define PLUG_IN_BINARY "file-xpm"
 #define SCALE_WIDTH    125
 
 /* Structs for the save dialog */

plug-ins/common/file-xwd.c

@@ -64,7 +64,7 @@
 
 #define LOAD_PROC      "file-xwd-load"
 #define SAVE_PROC      "file-xwd-save"
-#define PLUG_IN_BINARY "xwd"
+#define PLUG_IN_BINARY "file-xwd"
 
 
 typedef gulong  L_CARD32;

plug-ins/common/mkgen.pl

@@ -107,7 +107,9 @@ EOT
 
 foreach (sort keys %plugins) {
     my $makename = $_;
+    my $MAKENAME;
     $makename =~ s/-/_/g;
+    $MAKENAME = "\U$makename";
 
     my $libgimp = "";
 
@@ -144,7 +146,7 @@ foreach (sort keys %plugins) {
 
     if (exists $plugins{$_}->{cflags}) {
 	my $cflags = $plugins{$_}->{cflags};
-	my $optflags = $cflags =~ /FLAGS/ ? $cflags : "\U$_\E_CFLAGS";
+	my $optflags = $cflags =~ /FLAGS/ ? $cflags : "$MAKENAME\E_CFLAGS";
 
 	print MK <<EOT;
 

plug-ins/common/plugin-defs.pl

@@ -1,5 +1,4 @@
 %plugins = (
-    'aa' => { ui => 1, optional => 1 },
     'alien-map' => { ui => 1 },
     'align-layers' => { ui => 1 },
     'animation-optimize' => {},
@@ -14,7 +13,6 @@
     'border-average' => { ui => 1 },
     'bump-map' => { ui => 1 },
     'cartoon' => { ui => 1 },
-    'cel' => { ui => 1 },
     'channel-mixer' => { ui => 1 },
     'checkerboard' => { ui => 1 },
     'cml-explorer' => { ui => 1 },
@@ -33,41 +31,62 @@
     'convolution-matrix' => { ui => 1 },
     'crop-auto' => {},
     'crop-zealous' => {},
-    'csource' => { ui => 1 },
     'cubism' => { ui => 1 },
     'curve-bend' => { ui => 1 },
     'decompose' => { ui => 1 },
     'deinterlace' => { ui => 1 },
     'depth-merge' => { ui => 1 },
-    'desktop-link' => {},
     'despeckle' => { ui => 1 },
     'destripe' => { ui => 1 },
-    'dicom' => { ui => 1 },
     'diffraction' => { ui => 1 },
     'displace' => { ui => 1 },
     'edge' => { ui => 1 },
     'edge-dog' => { ui => 1 },
-    'edge-neon' => { ui => 1 },
     'edge-laplace' => {},
+    'edge-neon' => { ui => 1 },
     'edge-sobel' => { ui => 1 },
     'emboss' => { ui => 1 },
     'engrave' => { ui => 1 },
+    'file-aa' => { ui => 1, optional => 1, libs => 'LIBAA' },
+    'file-cel' => { ui => 1 },
+    'file-csource' => { ui => 1 },
+    'file-desktop-link' => {},
+    'file-dicom' => { ui => 1 },
+    'file-gbr' => { ui => 1 },
+    'file-gif-load' => {},
+    'file-gif-save' => { ui => 1 },
+    'file-gih' => { ui => 1 },
+    'file-glob' => {},
+    'file-header' => { ui => 1 },
+    'file-html-table' => { ui => 1 },
+    'file-mng' => { ui => 1, optional => 1, libs => 'LIBMNG' },
+    'file-pat' => { ui => 1 },
+    'file-pcx' => { ui => 1 },
+    'file-pix' => { ui => 1 },
+    'file-png' => { ui => 1, optional => 1, libs => 'LIBPNG', cflags => 'PNG_CFLAGS' },
+    'file-pnm' => { ui => 1 },
+    'file-pdf' => { ui => 1, optional => 1, libs => 'LIBPOPPLER', cflags => 'POPPLER_CFLAGS' },
+    'file-ps' => { ui => 1 },
+    'file-psp' => { ui => 1, optional => 1, libopt => 'z' },
+    'file-raw' => { ui => 1 },
+    'file-sunras' => { ui => 1 },
+    'file-svg' => { ui => 1, optional => 1, libs => 'LIBSVG', cflags => 'SVG_CFLAGS' },
+    'file-tga' => { ui => 1 },
+    'file-tiff-load' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
+    'file-tiff-save' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
+    'file-wmf' => { ui => 1, optional => 1, libs => 'LIBWMF', cflags => 'WMF_CFLAGS' },
+    'file-xbm' => { ui => 1 },
+    'file-xpm' => { ui => 1, optional => 1, libs => 'LIBXPM' },
+    'file-xwd' => {  ui => 1 },
     'film' => { ui => 1 },
     'filter-pack' => { ui => 1 },
     'fractal-trace' => { ui => 1 },
-    'gbr' => { ui => 1 },
     'gee' => { ui => 1 },
     'gee-zoom' => { ui => 1 },
-    'gif-load' => {},
-    'gif-save' => { ui => 1 },
-    'gih' => { ui => 1 },
-    'glob' => {},
     'gradient-map' => {},
     'grid' => { ui => 1 },
     'guillotine' => {},
-    'header' => { ui => 1 },
     'hot' => { ui => 1 },
-    'html-table' => { ui => 1 },
     'illusion' => { ui => 1 },
     'iwarp' => { ui => 1 },
     'jigsaw' => { ui => 1 },
@@ -77,7 +96,6 @@
     'lens-flare' => { ui => 1 },
     'mail' => { ui => 1, optional => 1 },
     'max-rgb' => { ui => 1 },
-    'mng' => { ui => 1, optional => 1 },
     'mosaic' => { ui => 1 },
     'newsprint' => { ui => 1 },
     'nl-filter' => { ui => 1 },
@@ -88,22 +106,13 @@
     'noise-spread' => { ui => 1 },
     'nova' => { ui => 1 },
     'oilify' => { ui => 1 },
-    'pat' => { ui => 1 },
-    'pcx' => { ui => 1 },
     'photocopy' => { ui => 1 },
-    'pix' => { ui => 1 },
     'pixelize' => { ui => 1 },
     'plasma' => { ui => 1 },
     'plugin-browser' => { ui => 1 },
-    'png' => { ui => 1, optional => 1, cflags => 1 },
-    'pnm' => { ui => 1 },
     'polar-coords' => { ui => 1 },
-    'poppler' => { ui => 1, optional => 1, cflags => 1 },
-    'postscript' => { ui => 1 },
     'procedure-browser' => { ui => 1 },
-    'psp' => { ui => 1, optional => 1, libopt => 'z' },
     'qbist' => { ui => 1 },
-    'raw' => { ui => 1 },
     'red-eye-removal' => { ui => 1 },
     'ripple' => { ui => 1 },
     'rotate' => {},
@@ -117,12 +126,7 @@
     'softglow' => { ui => 1 },
     'sparkle' => { ui => 1 },
     'sphere-designer' => { ui => 1 },
-    'sunras' => { ui => 1 },
-    'svg' => { ui => 1, optional => 1, cflags => 1 },
-    'tga' => { ui => 1 },
     'threshold-alpha' => { ui => 1 },
-    'tiff-load' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
-    'tiff-save' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
     'tile' => { ui => 1 },
     'tile-glass' => { ui => 1 },
     'tile-paper' => { ui => 1 },
@@ -138,9 +142,5 @@
     'waves' => { ui => 1 },
     'web-browser' => {},
     'whirl-pinch' => { ui => 1 },
-    'wind' => { ui => 1 },
+    'wind' => { ui => 1 }
-    'wmf' => { ui => 1, optional => 1, cflags => 1 },
-    'xbm' => { ui => 1 },
-    'xpm' => { ui => 1, optional => 1 },
-    'xwd' => {  ui => 1 }
 );

plug-ins/file-bmp/Makefile.am

@@ -16,9 +16,9 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = bmp
+libexec_PROGRAMS = file-bmp
 
-bmp_SOURCES = \
+file_bmp_SOURCES = \
 	bmp.c		\
 	bmp.h		\
 	bmp-read.c	\

plug-ins/file-bmp/bmp.c

@@ -221,7 +221,7 @@ run (const gchar      *name,
 
         case GIMP_RUN_WITH_LAST_VALS:
           if (run_mode == GIMP_RUN_WITH_LAST_VALS) lastvals = TRUE;
-          gimp_ui_init ("bmp", FALSE);
+          gimp_ui_init ("file-bmp", FALSE);
           export = gimp_export_image (&image_ID, &drawable_ID, "BMP",
                                       (GIMP_EXPORT_CAN_HANDLE_RGB |
                                        GIMP_EXPORT_CAN_HANDLE_ALPHA |
@@ -258,4 +258,3 @@ run (const gchar      *name,
 
   values[0].data.d_status = status;
 }
-

plug-ins/file-faxg3/Makefile.am

@@ -16,9 +16,9 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = faxg3
+libexec_PROGRAMS = file-faxg3
 
-faxg3_SOURCES = \
+file_faxg3_SOURCES = \
 	faxg3.c		\
 	g3.c		\
 	g3.h

plug-ins/file-fits/Makefile.am

@@ -16,9 +16,9 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = fits
+libexec_PROGRAMS = file-fits
 
-fits_SOURCES = \
+file_fits_SOURCES = \
 	fits.c		\
 	fits-io.c	\
 	fits-io.h

plug-ins/file-fits/fits.c

@@ -52,7 +52,7 @@
 
 #define LOAD_PROC      "file-fits-load"
 #define SAVE_PROC      "file-fits-save"
-#define PLUG_IN_BINARY "fits"
+#define PLUG_IN_BINARY "file-fits"
 
 
 /* Load info */

plug-ins/file-fli/Makefile.am

@@ -16,9 +16,9 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = fli
+libexec_PROGRAMS = file-fli
 
-fli_SOURCES = \
+file_fli_SOURCES = \
 	fli.h	\
 	fli.c	\
 	fli-gimp.c

plug-ins/file-fli/fli-gimp.c

@@ -68,7 +68,7 @@
 #define LOAD_PROC      "file-fli-load"
 #define SAVE_PROC      "file-fli-save"
 #define INFO_PROC      "file-fli-info"
-#define PLUG_IN_BINARY "fli"
+#define PLUG_IN_BINARY "file-fli"
 
 
 static void      query       (void);

plug-ins/file-ico/Makefile.am

@@ -16,11 +16,11 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = ico
+libexec_PROGRAMS = file-ico
 
-ico_CFLAGS = $(PNG_CFLAGS)
+file_ico_CFLAGS = $(PNG_CFLAGS)
 
-ico_SOURCES = \
+file_ico_SOURCES = \
 	ico.c		\
 	ico.h		\
 	ico-dialog.c	\

plug-ins/file-ico/ico-save.c

@@ -233,7 +233,7 @@ ico_save_dialog (gint32          image_ID,
   gint       i;
   gint       response;
 
-  gimp_ui_init ("winicon", TRUE);
+  gimp_ui_init ("file-ico", TRUE);
 
   dialog = ico_dialog_new (info);
   for (i = 0; i < info->num_icons; i++)

plug-ins/file-jpeg/Makefile.am

@@ -22,9 +22,9 @@ INCLUDES = \
 	$(EXIF_CFLAGS)	\
 	-I$(includedir)
 
-libexec_PROGRAMS = jpeg
+libexec_PROGRAMS = file-jpeg
 
-jpeg_SOURCES = \
+file_jpeg_SOURCES = \
 	jpeg.c		\
 	jpeg.h		\
 	jpeg-exif.c	\
@@ -41,7 +41,7 @@ jpeg_SOURCES = \
 	gimpexif.c	\
 	gimpexif.h
 
-jpeg_LDADD = \
+file_jpeg_LDADD = \
 	$(libgimpui)		\
 	$(libgimpwidgets)	\
 	$(libgimpconfig)	\

plug-ins/file-jpeg/jpeg.h

@@ -19,7 +19,7 @@
 #define LOAD_PROC       "file-jpeg-load"
 #define LOAD_THUMB_PROC "file-jpeg-load-thumb"
 #define SAVE_PROC       "file-jpeg-save"
-#define PLUG_IN_BINARY  "jpeg"
+#define PLUG_IN_BINARY  "flie-jpeg"
 
 /* headers used in some APPn markers */
 #define JPEG_APP_HEADER_EXIF "Exif\0\0"

plug-ins/file-psd/Makefile.am

@@ -17,10 +17,10 @@ AM_LDFLAGS = $(mwindows)
 libexecdir = $(gimpplugindir)/plug-ins
 
 libexec_PROGRAMS = \
-	psd-load	\
+	file-psd-load	\
-	psd-save
+	file-psd-save
 
-psd_load_SOURCES = \
+file_psd_load_SOURCES = \
 	psd.c			\
 	psd.h			\
 	psd-util.c		\
@@ -34,7 +34,7 @@ psd_load_SOURCES = \
 	psd-layer-res-load.c	\
 	psd-layer-res-load.h		
 
-psd_save_SOURCES = \
+file_psd_save_SOURCES = \
 	psd-save.c
 
 EXTRA_DIST = \

plug-ins/file-psd/psd-save.c

@@ -80,7 +80,7 @@
 /* *** DEFINES *** */
 
 #define SAVE_PROC      "file-psd-save"
-#define PLUG_IN_BINARY "psd-save"
+#define PLUG_IN_BINARY "file-psd-save"
 
 /* set to TRUE if you want debugging, FALSE otherwise */
 #define DEBUG FALSE

plug-ins/file-psd/psd.h

@@ -41,7 +41,7 @@
 #define LOAD_PROC                       "file-psd-load"
 #define LOAD_THUMB_PROC                 "file-psd-load-thumb"
 #define SAVE_PROC                       "file-psd-save"
-#define PLUG_IN_BINARY                  "psd"
+#define PLUG_IN_BINARY                  "file-psd"
 
 #define DECODE_XMP_PROC                 "plug-in-metadata-decode-xmp"
 

plug-ins/file-sgi/Makefile.am

@@ -16,9 +16,9 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-libexec_PROGRAMS = sgi
+libexec_PROGRAMS = file-sgi
 
-sgi_SOURCES = \
+file_sgi_SOURCES = \
 	sgi.c		\
 	sgi-lib.c	\
 	sgi-lib.h

plug-ins/file-sgi/sgi.c

@@ -47,7 +47,7 @@
 
 #define LOAD_PROC        "file-sgi-load"
 #define SAVE_PROC        "file-sgi-save"
-#define PLUG_IN_BINARY   "sgi"
+#define PLUG_IN_BINARY   "file-sgi"
 #define PLUG_IN_VERSION  "1.1.1 - 17 May 1998"